rtt 1.0.0 → 1.0.2

package/README.md

@@ -21,7 +21,7 @@ npm install rtt
 ## Usage
 
 ```typescript
-import {$NewType, $type, is, Model} from 'rtt';
+import {$NewType, is, Model} from 'rtt';
 
 // Define types
 const $A = () => $NewType('MyPackage', 'A');
@@ -29,7 +29,7 @@ const $B = () => $NewType('MyPackage', 'B', $A());
 
 // Create a model instance
 const model: Model = {
-  [$type]: $B(),
+  $type: $B(),
 };
 
 // Runtime type checks

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './brand';
-export * from './is';
+export * from './is/is';
 export * from './model';
-export * from './type.factory';
-export * from './type';
+export * from './type/type.factory';
+export * from './type/type';

package/dist/index.js

@@ -1,38 +1,34 @@
 function is(model, type) {
-  return model?.[$type]?.is(type) ?? false;
+  return "$type" in model && isType(model?.$type, type);
+}
+function isType(a, b) {
+  if (nameEquals(b, $Model()) || a.parent && isType(a.parent, b)) {
+    return true;
+  }
+  if (b.generics && b.generics.length > 0) {
+    if (a.generics && a.generics.length === b.generics.length) {
+      return a.generics.every((x, i) => isType(x, b.generics[i]));
+    }
+    return false;
+  }
+  return nameEquals(a, b);
+}
+function nameEquals(a, b) {
+  return a.typeName === b.typeName && a.packageName == b.packageName;
 }
-const $type = Symbol("type");
 const $Model = () => $NewType("RuntimeType", "Model");
 function $NewType(packageName, typeName, parent, generics) {
   return {
     packageName,
     typeName,
     parent,
-    generics,
-    toString() {
-      return `${this.packageName}.${this.typeName}`;
-    },
-    nameEquals(other) {
-      return this.typeName === other.typeName && this.packageName == other.packageName;
-    },
-    is(other) {
-      if (this.parent?.is(other) || other.nameEquals($Model())) {
-        return true;
-      }
-      if (other.generics && other.generics?.length > 0) {
-        if (this.generics && this.generics.length === other.generics.length) {
-          return this.generics.every((x, i) => x.is(other.generics[i]));
-        }
-        return false;
-      }
-      return this.nameEquals(other);
-    }
+    generics
   };
 }
 export {
   $Model,
   $NewType,
-  $type,
-  is
+  is,
+  isType
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/is.ts","../src/model.ts","../src/type.factory.ts"],"sourcesContent":["import {$Type, $type} from '#lib';\n\nexport function is<T extends $Type>(model: any, type: T): model is Exclude<T['type'], undefined> {\n  return (model?.[$type] as $Type)?.is(type) ?? false;\n}\n","import { $Type, $NewType } from \"#lib\";\n\nexport const $type = Symbol('type');\n\nexport interface Model {\n  [$type]: $Type;\n}\n\nexport const $Model = () => $NewType<Model>('RuntimeType', 'Model');\n","import {$Model, $Type, Model} from '#lib';\n\nexport function $NewType<T extends Model>(\n  packageName: string,\n  typeName: string,\n  parent?: $Type | null | undefined,\n  generics?: $Type[] | null | undefined,\n): $Type<T> {\n  return {\n    packageName,\n    typeName,\n    parent,\n    generics,\n\n    toString(): string {\n      return `${this.packageName}.${this.typeName}`;\n    },\n\n    nameEquals(other: $Type): boolean {\n      return this.typeName === other.typeName && this.packageName == other.packageName;\n    },\n\n    is(other: $Type): boolean {\n      if (this.parent?.is(other) || other.nameEquals($Model())) {\n        return true;\n      }\n\n      if (other.generics && other.generics?.length > 0) {\n        if (this.generics && this.generics.length === other.generics.length) {\n          // todo Covariance and contravariance ???\n          return this.generics.every((x, i) => x.is(other.generics![i]));\n        }\n\n        return false;\n      }\n\n      return this.nameEquals(other);\n    },\n  };\n}\n"],"names":[],"mappings":"AAEO,SAAS,GAAoB,OAAY,MAAiD;AAC/F,SAAQ,QAAQ,KAAK,GAAa,GAAG,IAAI,KAAK;AAChD;ACFO,MAAM,QAAQ,OAAO,MAAM;AAM3B,MAAM,SAAS,MAAM,SAAgB,eAAe,OAAO;ACN3D,SAAS,SACd,aACA,UACA,QACA,UACU;AACV,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IAEA,WAAmB;AACjB,aAAO,GAAG,KAAK,WAAW,IAAI,KAAK,QAAQ;AAAA,IAC7C;AAAA,IAEA,WAAW,OAAuB;AAChC,aAAO,KAAK,aAAa,MAAM,YAAY,KAAK,eAAe,MAAM;AAAA,IACvE;AAAA,IAEA,GAAG,OAAuB;AACxB,UAAI,KAAK,QAAQ,GAAG,KAAK,KAAK,MAAM,WAAW,OAAA,CAAQ,GAAG;AACxD,eAAO;AAAA,MACT;AAEA,UAAI,MAAM,YAAY,MAAM,UAAU,SAAS,GAAG;AAChD,YAAI,KAAK,YAAY,KAAK,SAAS,WAAW,MAAM,SAAS,QAAQ;AAEnE,iBAAO,KAAK,SAAS,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,SAAU,CAAC,CAAC,CAAC;AAAA,QAC/D;AAEA,eAAO;AAAA,MACT;AAEA,aAAO,KAAK,WAAW,KAAK;AAAA,IAC9B;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"index.js","sources":["../src/is/is.ts","../src/model.ts","../src/type/type.factory.ts"],"sourcesContent":["import {$Model, $Type} from '#lib';\n\nexport function is<T extends $Type>(model: any, type: T): model is Exclude<T['type'], undefined> {\n  return '$type' in model && isType(model?.$type, type);\n}\n\nexport function isType(a: $Type, b: $Type): boolean {\n  if ( nameEquals(b, $Model()) || (a.parent && isType(a.parent, b))) {\n    return true;\n  }\n\n  if (b.generics && b.generics.length > 0) {\n    if (a.generics && a.generics.length === b.generics.length) {\n      // todo Covariance and Contravariance ???\n      return a.generics.every((x, i) => isType(x, b.generics![i]));\n    }\n\n    return false;\n  }\n\n  return nameEquals(a, b);\n}\n\nfunction nameEquals(a: $Type, b: $Type): boolean {\n  return a.typeName === b.typeName && a.packageName == b.packageName;\n}\n","import {$NewType, $Type} from '#lib';\n\nexport interface Model {\n  $type: $Type;\n}\n\nexport const $Model = () => $NewType<Model>('RuntimeType', 'Model');\n","import {$Type, Model} from '#lib';\n\nexport function $NewType<T extends Model>(\n  packageName: string,\n  typeName: string,\n  parent?: $Type | null | undefined,\n  generics?: $Type[] | null | undefined,\n): $Type<T> {\n  return {\n    packageName,\n    typeName,\n    parent,\n    generics,\n  };\n}\n"],"names":[],"mappings":"AAEO,SAAS,GAAoB,OAAY,MAAiD;AAC/F,SAAO,WAAW,SAAS,OAAO,OAAO,OAAO,IAAI;AACtD;AAEO,SAAS,OAAO,GAAU,GAAmB;AAClD,MAAK,WAAW,GAAG,OAAA,CAAQ,KAAM,EAAE,UAAU,OAAO,EAAE,QAAQ,CAAC,GAAI;AACjE,WAAO;AAAA,EACT;AAEA,MAAI,EAAE,YAAY,EAAE,SAAS,SAAS,GAAG;AACvC,QAAI,EAAE,YAAY,EAAE,SAAS,WAAW,EAAE,SAAS,QAAQ;AAEzD,aAAO,EAAE,SAAS,MAAM,CAAC,GAAG,MAAM,OAAO,GAAG,EAAE,SAAU,CAAC,CAAC,CAAC;AAAA,IAC7D;AAEA,WAAO;AAAA,EACT;AAEA,SAAO,WAAW,GAAG,CAAC;AACxB;AAEA,SAAS,WAAW,GAAU,GAAmB;AAC/C,SAAO,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE;AACzD;ACnBO,MAAM,SAAS,MAAM,SAAgB,eAAe,OAAO;ACJ3D,SAAS,SACd,aACA,UACA,QACA,UACU;AACV,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;"}

package/dist/{is.d.ts → is/is.d.ts}

@@ -1,2 +1,3 @@
-import { $Type } from './index.ts';
+import { $Type } from '../index.ts';
 export declare function is<T extends $Type>(model: any, type: T): model is Exclude<T['type'], undefined>;
+export declare function isType(a: $Type, b: $Type): boolean;

package/dist/model.d.ts

@@ -1,6 +1,5 @@
 import { $Type } from './index.ts';
-export declare const $type: unique symbol;
 export interface Model {
-    [$type]: $Type;
+    $type: $Type;
 }
 export declare const $Model: () => $Type<Model>;

package/dist/{type.d.ts → type/type.d.ts}

@@ -4,7 +4,4 @@ export interface $Type<T = unknown> {
     type?: T;
     parent?: $Type | null | undefined;
     generics?: $Type[] | null | undefined;
-    toString(): string;
-    nameEquals(other: $Type): boolean;
-    is(other: $Type): boolean;
 }

package/dist/{type.factory.d.ts → type/type.factory.d.ts}

@@ -1,2 +1,2 @@
-import { $Type, Model } from './index.ts';
+import { $Type, Model } from '../index.ts';
 export declare function $NewType<T extends Model>(packageName: string, typeName: string, parent?: $Type | null | undefined, generics?: $Type[] | null | undefined): $Type<T>;

package/dist/type/type.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rtt",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Runtime Typescript Types",
   "main": "index.js",
   "scripts": {