json-as 0.5.37 → 0.5.38

package/transform/src/index.ts

@@ -2,7 +2,7 @@ import {
   ClassDeclaration,
   FieldDeclaration,
   Source,
-  Parser
+  Parser,
 } from "assemblyscript/dist/assemblyscript";
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
@@ -47,21 +47,32 @@ class AsJSONTransform extends BaseVisitor {
       parent: node.extendsType ? toString(node.extendsType) : "",
       node: node,
       encodeStmts: [],
-      setDataStmts: []
-    }
+      setDataStmts: [],
+    };
 
     if (this.currentClass.parent.length > 0) {
-      const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
+      const parentSchema = this.schemasList.find(
+        (v) => v.name == this.currentClass.parent
+      );
       if (parentSchema?.encodeStmts) {
         parentSchema?.encodeStmts.push(parentSchema?.encodeStmts.pop() + ",");
         this.currentClass.encodeStmts.push(...parentSchema?.encodeStmts);
       } else {
-        console.error("Class extends " + this.currentClass.parent + ", but parent class not found. Maybe add the @json decorator over parent class?");
+        console.error(
+          "Class extends " +
+          this.currentClass.parent +
+          ", but parent class not found. Maybe add the @json decorator over parent class?"
+        );
       }
     }
 
-    const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
-    const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
+    const parentSchema = this.schemasList.find(
+      (v) => v.name == this.currentClass.parent
+    );
+    const members = [
+      ...node.members,
+      ...(parentSchema ? parentSchema.node.members : []),
+    ];
 
     for (const mem of members) {
       if (mem.type && mem.type.name && mem.type.name.identifier.text) {
@@ -72,13 +83,26 @@ class AsJSONTransform extends BaseVisitor {
 
         // @ts-ignore
         let type = toString(member.type);
-        
+
         const name = member.name.text;
         this.currentClass.keys.push(name);
         // @ts-ignore
         this.currentClass.types.push(type);
         // @ts-ignore
-        if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
+        if (
+          [
+            "u8",
+            "i8",
+            "u16",
+            "i16",
+            "u32",
+            "i32",
+            "f32",
+            "u64",
+            "i64",
+            "f64",
+          ].includes(type.toLowerCase())
+        ) {
           this.currentClass.encodeStmts.push(
             `"${name}":\${this.${name}.toString()},`
           );
@@ -101,11 +125,12 @@ class AsJSONTransform extends BaseVisitor {
     let serializeFunc = "";
 
     if (this.currentClass.encodeStmts.length > 0) {
-      const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1]!;
-      this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] = stmt!.slice(
-        0,
-        stmt.length - 1
-      );
+      const stmt =
+        this.currentClass.encodeStmts[
+        this.currentClass.encodeStmts.length - 1
+        ]!;
+      this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
+        stmt!.slice(0, stmt.length - 1);
       serializeFunc = `
       @inline
       __JSON_Serialize(): string {
@@ -134,10 +159,7 @@ class AsJSONTransform extends BaseVisitor {
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);
 
-    const setDataMethod = SimpleParser.parseClassMember(
-      setKeyFunc,
-      node
-    );
+    const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
     node.members.push(setDataMethod);
 
     this.schemasList.push(this.currentClass);
@@ -154,17 +176,19 @@ export default class Transformer extends Transform {
     const transformer = new AsJSONTransform();
 
     // Sort the sources so that user scripts are visited last
-    const sources = parser.sources.filter(source => !isStdlib(source)).sort((_a, _b) => {
-      const a = _a.internalPath
-      const b = _b.internalPath
-      if (a[0] === "~" && b[0] !== "~") {
-        return -1;
-      } else if (a[0] !== "~" && b[0] === "~") {
-        return 1;
-      } else {
-        return 0;
-      }
-    });
+    const sources = parser.sources
+      .filter((source) => !isStdlib(source))
+      .sort((_a, _b) => {
+        const a = _a.internalPath;
+        const b = _b.internalPath;
+        if (a[0] === "~" && b[0] !== "~") {
+          return -1;
+        } else if (a[0] !== "~" && b[0] === "~") {
+          return 1;
+        } else {
+          return 0;
+        }
+      });
 
     // Loop over every source
     for (const source of sources) {
@@ -174,4 +198,4 @@ export default class Transformer extends Transform {
       }
     }
   }
-};
+}

package/transform/tsconfig.json

@@ -1,70 +1,70 @@
-{
-  "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-    /* Basic Options */
-    // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
-    "module": "es6" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
-    // "lib": [],                                   /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                             /* Allow javascript files to be compiled. */
-    // "checkJs": true,                             /* Report errors in .js files. */
-    // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
-    "declaration": false /* Generates corresponding '.d.ts' file. */,
-    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    "sourceMap": false /* Generates corresponding '.map' file. */,
-    // "outFile": "./",                             /* Concatenate and emit output to single file. */
-    "outDir": "./lib" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
-    // "composite": true,                           /* Enable project compilation */
-    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
-    // "removeComments": true,                      /* Do not emit comments to output. */
-    // "noEmit": true,                              /* Do not emit outputs. */
-    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
-    "downlevelIteration": true /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */,
-    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": true /* Enable all strict type-checking options. */,
-    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'Unknown' type. */,
-    "strictNullChecks": true /* Enable strict null checks. */,
-    "strictFunctionTypes": true /* Enable strict checking of function types. */,
-    "strictBindCallApply": true /* Enable strict 'bind', 'call', and 'apply' methods on functions. */,
-    "strictPropertyInitialization": true /* Enable strict checking of property initialization in classes. */,
-    "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'Unknown' type. */,
-    "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,
-
-    /* Additional Checks */
-    "noUnusedLocals": true /* Report errors on unused locals. */,
-    "noUnusedParameters": true /* Report errors on unused parameters. */,
-    "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
-    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
-    "noUncheckedIndexedAccess": true /* Include 'undefined' in index signature results */,
-    "noPropertyAccessFromIndexSignature": true /* Require undeclared properties from index signatures to use element accesses. */,
-
-    /* Module Resolution Options */
-    "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                             /* List of folders to include type definitions from. */
-    // "types": [],                                 /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": false /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
-    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,              /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
-
-    /* Advanced Options */
-    "skipLibCheck": true /* Skip type checking of declaration files. */,
-    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
-  }
-}
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                         /* Enable incremental compilation */
+    "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "module": "es6" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+    // "lib": [],                                   /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                             /* Allow javascript files to be compiled. */
+    // "checkJs": true,                             /* Report errors in .js files. */
+    // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
+    "declaration": false /* Generates corresponding '.d.ts' file. */,
+    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    "sourceMap": false /* Generates corresponding '.map' file. */,
+    // "outFile": "./",                             /* Concatenate and emit output to single file. */
+    "outDir": "./lib" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    // "composite": true,                           /* Enable project compilation */
+    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
+    // "removeComments": true,                      /* Do not emit comments to output. */
+    // "noEmit": true,                              /* Do not emit outputs. */
+    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
+    "downlevelIteration": true /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */,
+    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'Unknown' type. */,
+    "strictNullChecks": true /* Enable strict null checks. */,
+    "strictFunctionTypes": true /* Enable strict checking of function types. */,
+    "strictBindCallApply": true /* Enable strict 'bind', 'call', and 'apply' methods on functions. */,
+    "strictPropertyInitialization": true /* Enable strict checking of property initialization in classes. */,
+    "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'Unknown' type. */,
+    "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,
+
+    /* Additional Checks */
+    "noUnusedLocals": true /* Report errors on unused locals. */,
+    "noUnusedParameters": true /* Report errors on unused parameters. */,
+    "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
+    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
+    "noUncheckedIndexedAccess": true /* Include 'undefined' in index signature results */,
+    "noPropertyAccessFromIndexSignature": true /* Require undeclared properties from index signatures to use element accesses. */,
+
+    /* Module Resolution Options */
+    "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
+    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                             /* List of folders to include type definitions from. */
+    // "types": [],                                 /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": false /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,              /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+  }
+}

package/tsconfig.json

@@ -11,11 +11,11 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
-    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+       "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+       "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
     // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
     // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
     // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
@@ -25,7 +25,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "commonjs" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
@@ -71,22 +71,22 @@
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
     /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
     // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+       "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
     // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
     // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
     // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
     // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+       "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+       "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+       "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
     // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
     // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
     // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
@@ -98,6 +98,6 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   }
 }

package/transform/src/hash.ts

@@ -1,83 +0,0 @@
-// XXHash 32-bit as a starting point, see: https://cyan4973.github.io/xxHash
-
-// primes
-// @ts-ignore: decorator
-const XXH32_P1: number = 2654435761;
-// @ts-ignore: decorator
-const XXH32_P2: number = 2246822519;
-// @ts-ignore: decorator
-const XXH32_P3: number = 3266489917;
-// @ts-ignore: decorator
-const XXH32_P4: number = 668265263;
-// @ts-ignore: decorator
-const XXH32_P5: number = 374761393;
-// @ts-ignore: decorator
-const XXH32_SEED: number = 0;
-
-function hash32(key: number, len: number = 4): number {
-    let h: number = XXH32_SEED + XXH32_P5 + len;
-    h += key * XXH32_P3;
-    h = rotl(h, 17) * XXH32_P4;
-    h ^= h >> 15;
-    h *= XXH32_P2;
-    h ^= h >> 13;
-    h *= XXH32_P3;
-    h ^= h >> 16;
-    return h;
-}
-
-function rotl(x: number, r: number): number {
-    return (x << r) | (x >>> (32 - r));
-}
-
-function mix(h: number, key: number): number {
-    return rotl(h + key * XXH32_P2, 13) * XXH32_P1;
-}
-
-export function hashStr(key: string): number {
-    if (key == null) return XXH32_SEED;
-
-    let h: number = key.length;
-    let len: number = h;
-    let pos = 0;
-
-    if (len >= 16) {
-        let s1 = XXH32_SEED + XXH32_P1 + XXH32_P2;
-        let s2 = XXH32_SEED + XXH32_P2;
-        let s3 = XXH32_SEED;
-        let s4 = XXH32_SEED - XXH32_P1;
-
-        let end = len + pos - 16;
-        while (pos <= end) {
-            s1 = mix(s1, key.charCodeAt(pos));
-            s2 = mix(s2, key.charCodeAt(pos + 1));
-            s3 = mix(s3, key.charCodeAt(pos + 2));
-            s4 = mix(s4, load<number>(pos, 12));
-            pos += 16;
-        }
-        h += rotl(s1, 1) + rotl(s2, 7) + rotl(s3, 12) + rotl(s4, 18);
-    } else {
-        h += XXH32_SEED + XXH32_P5;
-    }
-
-    let end = changetype<number>(key) + len - 4;
-    while (pos <= end) {
-        h += load<number>(pos) * XXH32_P3;
-        h = rotl(h, 17) * XXH32_P4;
-        pos += 4;
-    }
-
-    end = changetype<number>(key) + len;
-    while (pos < end) {
-        h += <number>load<u8>(pos) * XXH32_P5;
-        h = rotl(h, 11) * XXH32_P1;
-        pos++;
-    }
-
-    h ^= h >> 15;
-    h *= XXH32_P2;
-    h ^= h >> 13;
-    h *= XXH32_P3;
-    h ^= h >> 16;
-    return h;
-}