@esportsplus/reactivity 0.25.4 → 0.25.6

package/build/constants.d.ts

@@ -1,6 +1,6 @@
 declare const COMPILATION_ENTRYPOINT = "reactive";
 declare const COMPILATION_ENTRYPOINT_REGEX: RegExp;
-declare const COMPILATION_NAMESPACE = "reactive";
+declare const COMPILATION_NAMESPACE: string;
 declare const COMPILATION_TYPE_ARRAY = "array";
 declare const COMPILATION_TYPE_COMPUTED = "computed";
 declare const COMPILATION_TYPE_SIGNAL = "signal";

package/build/constants.js

@@ -1,6 +1,7 @@
+import uid from 'node_modules/@esportsplus/typescript/build/transformer/uid';
 const COMPILATION_ENTRYPOINT = 'reactive';
 const COMPILATION_ENTRYPOINT_REGEX = /\breactive\b/;
-const COMPILATION_NAMESPACE = 'reactive';
+const COMPILATION_NAMESPACE = uid(COMPILATION_ENTRYPOINT);
 const COMPILATION_TYPE_ARRAY = 'array';
 const COMPILATION_TYPE_COMPUTED = 'computed';
 const COMPILATION_TYPE_SIGNAL = 'signal';

package/build/reactive/index.d.ts

@@ -1,25 +1,10 @@
-import { Prettify } from '@esportsplus/utilities';
 import { ReactiveArray } from './array.js';
 import { Reactive } from '../types.js';
-declare const READONLY: unique symbol;
 type Guard<T> = T extends Record<PropertyKey, unknown> ? T extends {
     dispose: any;
 } ? {
     never: '[ dispose ] is a reserved key';
 } : T : never;
-type Infer<T> = T extends (...args: unknown[]) => Promise<infer R> ? R | undefined : T extends (...args: any[]) => infer R ? R : T extends (infer U)[] ? U[] & Pick<ReactiveArray<U>, 'clear' | 'on' | 'once'> : T extends ReactiveObject<any> ? T : T extends Record<PropertyKey, unknown> ? {
-    [K in keyof T]: T[K];
-} : T;
-type ReactiveObject<T> = T extends Record<PropertyKey, unknown> ? Reactive<Prettify<{
-    [K in keyof T]: Infer<T[K]>;
-} & {
-    dispose: VoidFunction;
-}>> : T extends (infer U)[] ? U[] & Pick<ReactiveArray<U>, 'clear' | 'on' | 'once'> : never;
-declare function reactive<T extends () => unknown>(_input: T): Reactive<ReturnType<T> & {
-    readonly [READONLY]: true;
-}>;
-declare function reactive<T extends Record<PropertyKey, any>>(_input: Guard<T>): ReactiveObject<T>;
-declare function reactive<T>(_input: T[]): Reactive<T[] & Pick<ReactiveArray<T>, 'clear' | 'on' | 'once'>>;
+declare function reactive<T extends Record<PropertyKey, any>>(_input: Guard<T>): Reactive<T>;
 export default reactive;
 export { reactive, ReactiveArray };
-export type { Reactive, ReactiveObject };

package/build/reactive/index.js

@@ -1,8 +1,8 @@
 import { ReactiveArray } from './array.js';
-import { PACKAGE } from '../constants.js';
+import { COMPILATION_ENTRYPOINT, PACKAGE } from '../constants.js';
 function reactive(_input) {
-    throw new Error(`${PACKAGE}: reactive() called at runtime. ` +
-        'Ensure vite-plugin-reactivity-compile is configured.');
+    throw new Error(`${PACKAGE}: ${COMPILATION_ENTRYPOINT}() called at runtime. ` +
+        'Ensure vite plugin is configured.');
 }
 export default reactive;
 export { reactive, ReactiveArray };

package/build/transformer/index.js

@@ -1,18 +1,17 @@
 import { ts } from '@esportsplus/typescript';
-import { uid } from '@esportsplus/typescript/transformer';
 import { COMPILATION_NAMESPACE } from '../constants.js';
 import { contains } from './detector.js';
 import array from './transforms/array.js';
 import object from './transforms/object.js';
 import primitives from './transforms/primitives.js';
-let ns = uid(COMPILATION_NAMESPACE), transforms = [object, array, primitives];
+let transforms = [object, array, primitives];
 const transform = (sourceFile) => {
     let bindings = new Map(), code = sourceFile.getFullText(), current = sourceFile, result, transformed = false;
     if (!contains(code)) {
         return { code, sourceFile, transformed: false };
     }
     for (let i = 0, n = transforms.length; i < n; i++) {
-        result = transforms[i](current, bindings, ns);
+        result = transforms[i](current, bindings, COMPILATION_NAMESPACE);
         if (result !== code) {
             current = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
             code = result;
@@ -20,7 +19,7 @@ const transform = (sourceFile) => {
         }
     }
     if (transformed) {
-        code = `import * as ${ns} from '@esportsplus/reactivity';\n` + code;
+        code = `import * as ${COMPILATION_NAMESPACE} from '@esportsplus/reactivity';\n` + code;
         sourceFile = ts.createSourceFile(sourceFile.fileName, code, sourceFile.languageVersion, true);
     }
     return { code, sourceFile, transformed };

package/build/types.d.ts

@@ -1,5 +1,6 @@
-import { COMPUTED, SIGNAL, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants.js';
 import { ts } from '@esportsplus/typescript';
+import { COMPUTED, SIGNAL, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants.js';
+import { ReactiveArray } from './reactive/index.js';
 type BindingType = 'array' | 'computed' | 'object' | 'signal';
 type Bindings = Map<string, BindingType>;
 interface Computed<T> {
@@ -24,7 +25,16 @@ interface Link {
     sub: Computed<unknown>;
     version: number;
 }
-type Reactive<T> = T;
+declare const READONLY: unique symbol;
+type Reactive<T> = T extends (...args: unknown[]) => Promise<infer R> ? (R | undefined) & {
+    readonly [READONLY]: true;
+} : T extends (...args: any[]) => infer R ? R & {
+    readonly [READONLY]: true;
+} : T extends (infer U)[] ? U[] & Pick<ReactiveArray<U>, 'clear' | 'on' | 'once'> : T extends Record<PropertyKey, unknown> ? {
+    [K in keyof T]: T[K];
+} & {
+    dispose: VoidFunction;
+} : T;
 type Signal<T> = {
     subs: Link | null;
     subsTail: Link | null;

package/package.json

@@ -36,7 +36,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.25.4",
+  "version": "0.25.6",
   "scripts": {
     "build": "tsc",
     "build:test": "pnpm build && vite build --config test/vite.config.ts",

package/src/constants.ts

@@ -1,8 +1,10 @@
+import uid from 'node_modules/@esportsplus/typescript/build/transformer/uid';
+
 const COMPILATION_ENTRYPOINT = 'reactive';
 
 const COMPILATION_ENTRYPOINT_REGEX = /\breactive\b/;
 
-const COMPILATION_NAMESPACE = 'reactive';
+const COMPILATION_NAMESPACE = uid(COMPILATION_ENTRYPOINT);
 
 const COMPILATION_TYPE_ARRAY = 'array';
 

package/src/reactive/index.ts

@@ -1,12 +1,8 @@
-import { Prettify } from '@esportsplus/utilities';
 import { ReactiveArray } from './array';
-import { PACKAGE } from '~/constants';
+import { COMPILATION_ENTRYPOINT, PACKAGE } from '~/constants';
 import { Reactive } from '~/types';
 
 
-// Branded type to prevent assignment to computed values
-declare const READONLY: unique symbol;
-
 type Guard<T> =
     T extends Record<PropertyKey, unknown>
         ? T extends { dispose: any }
@@ -14,38 +10,15 @@ type Guard<T> =
             : T
         : never;
 
-type Infer<T> =
-    T extends (...args: unknown[]) => Promise<infer R>
-        ? R | undefined
-        : T extends (...args: any[]) => infer R
-            ? R
-            : T extends (infer U)[]
-                ? U[] & Pick<ReactiveArray<U>, 'clear' | 'on' | 'once'>
-                : T extends ReactiveObject<any>
-                    ? T
-                    : T extends Record<PropertyKey, unknown>
-                        ? { [K in keyof T]: T[K] }
-                        : T;
-
-type ReactiveObject<T> =
-    T extends Record<PropertyKey, unknown>
-        ? Reactive< Prettify<{ [K in keyof T]: Infer<T[K]> } & { dispose: VoidFunction }> >
-        : T extends (infer U)[]
-            ? U[] & Pick<ReactiveArray<U>, 'clear' | 'on' | 'once'>
-            : never;
-
 
-function reactive<T extends () => unknown>(_input: T): Reactive< ReturnType<T> & { readonly [READONLY]: true } >;
-function reactive<T extends Record<PropertyKey, any>>(_input: Guard<T>): ReactiveObject<T>;
-function reactive<T>(_input: T[]): Reactive< T[] & Pick<ReactiveArray<T>, 'clear' | 'on' | 'once'> >;
+function reactive<T extends Record<PropertyKey, any>>(_input: Guard<T>): Reactive<T>;
 function reactive<T>(_input: T): Reactive<T> {
     throw new Error(
-        `${PACKAGE}: reactive() called at runtime. ` +
-        'Ensure vite-plugin-reactivity-compile is configured.'
+        `${PACKAGE}: ${COMPILATION_ENTRYPOINT}() called at runtime. ` +
+        'Ensure vite plugin is configured.'
     );
 }
 
 
 export default reactive;
 export { reactive, ReactiveArray };
-export type { Reactive, ReactiveObject };

package/src/transformer/index.ts

@@ -1,5 +1,4 @@
 import { ts } from '@esportsplus/typescript';
-import { uid } from '@esportsplus/typescript/transformer';
 import { COMPILATION_NAMESPACE } from '~/constants.js';
 import type { Bindings, TransformResult } from '~/types';
 import { contains } from './detector';
@@ -8,8 +7,7 @@ import object from './transforms/object';
 import primitives from './transforms/primitives';
 
 
-let ns = uid(COMPILATION_NAMESPACE),
-    transforms = [object, array, primitives];
+let transforms = [object, array, primitives];
 
 
 const transform = (sourceFile: ts.SourceFile): TransformResult => {
@@ -24,7 +22,7 @@ const transform = (sourceFile: ts.SourceFile): TransformResult => {
     }
 
     for (let i = 0, n = transforms.length; i < n; i++) {
-        result = transforms[i](current, bindings, ns);
+        result = transforms[i](current, bindings, COMPILATION_NAMESPACE);
 
         if (result !== code) {
             current = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
@@ -34,7 +32,7 @@ const transform = (sourceFile: ts.SourceFile): TransformResult => {
     }
 
     if (transformed) {
-        code = `import * as ${ns} from '@esportsplus/reactivity';\n` + code;
+        code = `import * as ${COMPILATION_NAMESPACE} from '@esportsplus/reactivity';\n` + code;
         sourceFile = ts.createSourceFile(sourceFile.fileName, code, sourceFile.languageVersion, true);
     }
 

package/src/types.ts

@@ -1,5 +1,6 @@
-import { COMPUTED, SIGNAL, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants';
 import { ts } from '@esportsplus/typescript';
+import { COMPUTED, SIGNAL, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants';
+import { ReactiveArray } from './reactive';
 
 
 type BindingType = 'array' | 'computed' | 'object' | 'signal';
@@ -37,7 +38,17 @@ interface Link {
 
 // If we expose internals optimizing compiler may break api.
 // Instead we will use this as a shim.
-type Reactive<T> = T;
+declare const READONLY: unique symbol;
+
+type Reactive<T> = T extends (...args: unknown[]) => Promise<infer R>
+    ? (R | undefined) & { readonly [READONLY]: true }
+    : T extends (...args: any[]) => infer R
+        ? R & { readonly [READONLY]: true }
+        : T extends (infer U)[]
+            ? U[] & Pick<ReactiveArray<U>, 'clear' | 'on' | 'once'>
+            : T extends Record<PropertyKey, unknown>
+                ? { [K in keyof T]: T[K] } & { dispose: VoidFunction }
+                : T;
 
 type Signal<T> = {
     subs: Link | null;
@@ -54,8 +65,7 @@ interface TransformResult {
 
 
 export type {
-    BindingType,
-    Bindings,
+    BindingType, Bindings,
     Computed,
     Link,
     Reactive,