npm - @as-pect/transform - Versions diffs - 6.2.4 → 7.0.0 - Mend

@as-pect/transform 6.2.4 → 7.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/createAddReflectedValueKeyValuePairsMember.js +29 -26
package/lib/createStrictEqualsMember.js +14 -22
package/lib/emptyTransformer.js +0 -1
package/lib/index.js +3 -6
package/package.json +8 -7
package/lib/transform.js +0 -7

package/lib/createAddReflectedValueKeyValuePairsMember.js CHANGED Viewed

@@ -1,6 +1,22 @@
-import { AssertionKind, CommonFlags, NodeKind, ParameterKind, Token, TypeNode, } from "assemblyscript/dist/assemblyscript.js";
+// import { } from "@as-pect/;
+import { TypeNode, } from "assemblyscript/dist/assemblyscript.js";
 import { createGenericTypeParameter } from "./createGenericTypeParameter.js";
 import { djb2Hash } from "./hash.js";
+// const TypeNode = TypeNode;
+// const {
+//   BlockStatement,
+//   ClassDeclaration,
+//   FieldDeclaration,
+//   MethodDeclaration,
+//   Range,
+//   Statement
+// } =
+// type BlockStatement = InstanceType<typeof BlockStatement>;
+// type ClassDeclaration = InstanceType<typeof ClassDeclaration>;
+// type FieldDeclaration = InstanceType<typeof FieldDeclaration>;
+// type MethodDeclaration = InstanceType<typeof MethodDeclaration>;
+// type Range = InstanceType<typeof Range>;
+// type Statement = InstanceType<typeof Statement>;
 /**
  * Create a prototype method called __aspectAddReflectedValueKeyValuePairs on a given
  * ClassDeclaration dynamically.
@@ -10,18 +26,13 @@ import { djb2Hash } from "./hash.js";
 export function createAddReflectedValueKeyValuePairsMember(classDeclaration) {
     const range = classDeclaration.name.range;
     // __aspectAddReflectedValueKeyValuePairs(reflectedValue: i32, seen: Map<usize, i32>, ignore: StaticArray<i64>): void
-    return TypeNode.createMethodDeclaration(TypeNode.createIdentifierExpression("__aspectAddReflectedValueKeyValuePairs", range), null, CommonFlags.PUBLIC |
-        CommonFlags.INSTANCE |
-        (classDeclaration.isGeneric ? CommonFlags.GENERIC_CONTEXT : 0), null, TypeNode.createFunctionType([
+    return TypeNode.createMethodDeclaration(TypeNode.createIdentifierExpression("__aspectAddReflectedValueKeyValuePairs", range), null, 256 /* CommonFlags.PUBLIC */ | 262144 /* CommonFlags.INSTANCE */ | (classDeclaration.isGeneric ? 131072 /* CommonFlags.GENERIC_CONTEXT */ : 0), null, TypeNode.createFunctionType([
         // reflectedValue: i32
-        TypeNode.createParameter(ParameterKind.DEFAULT, TypeNode.createIdentifierExpression("reflectedValue", range), createGenericTypeParameter("i32", range), null, range),
+        TypeNode.createParameter(0 /* ParameterKind.DEFAULT */, TypeNode.createIdentifierExpression("reflectedValue", range), createGenericTypeParameter("i32", range), null, range),
         // seen: Map<usize, i32>
-        TypeNode.createParameter(ParameterKind.DEFAULT, TypeNode.createIdentifierExpression("seen", range), TypeNode.createNamedType(TypeNode.createSimpleTypeName("Map", range), [
-            createGenericTypeParameter("usize", range),
-            createGenericTypeParameter("i32", range),
-        ], false, range), null, range),
+        TypeNode.createParameter(0 /* ParameterKind.DEFAULT */, TypeNode.createIdentifierExpression("seen", range), TypeNode.createNamedType(TypeNode.createSimpleTypeName("Map", range), [createGenericTypeParameter("usize", range), createGenericTypeParameter("i32", range)], false, range), null, range),
         // ignore: i64[]
-        TypeNode.createParameter(ParameterKind.DEFAULT, TypeNode.createIdentifierExpression("ignore", range),
+        TypeNode.createParameter(0 /* ParameterKind.DEFAULT */, TypeNode.createIdentifierExpression("ignore", range),
         // Array<i64> -> i64[]
         TypeNode.createNamedType(TypeNode.createSimpleTypeName("StaticArray", range), [createGenericTypeParameter("i64", range)], false, range), null, range),
     ],
@@ -41,10 +52,10 @@ function createAddReflectedValueKeyValuePairsFunctionBody(classDeclaration) {
     // for each field declaration, generate a check
     for (const member of classDeclaration.members) {
         // if it's an instance member, regardless of access modifier
-        if (member.is(CommonFlags.INSTANCE)) {
+        if (member.is(262144 /* CommonFlags.INSTANCE */)) {
             switch (member.kind) {
                 // field declarations automatically get added
-                case NodeKind.FIELDDECLARATION: {
+                case 54 /* NodeKind.FIELDDECLARATION */: {
                     const fieldDeclaration = member;
                     const hashValue = djb2Hash(member.name.text);
                     pushKeyValueIfStatement(body, member.name.text, hashValue, fieldDeclaration.range);
@@ -52,8 +63,8 @@ function createAddReflectedValueKeyValuePairsFunctionBody(classDeclaration) {
                     break;
                 }
                 // function declarations can be getters, check the get flag
-                case NodeKind.METHODDECLARATION: {
-                    if (member.is(CommonFlags.GET)) {
+                case 58 /* NodeKind.METHODDECLARATION */: {
+                    if (member.is(2048 /* CommonFlags.GET */)) {
                         const methodDeclaration = member;
                         const hashValue = djb2Hash(member.name.text);
                         pushKeyValueIfStatement(body, member.name.text, hashValue, methodDeclaration.range);
@@ -95,9 +106,7 @@ function createIsDefinedIfStatement(nameHashes, range) {
             TypeNode.createCallExpression(TypeNode.createPropertyAccessExpression(TypeNode.createIdentifierExpression("StaticArray", range), TypeNode.createIdentifierExpression("concat", range), range), null, [
                 TypeNode.createIdentifierExpression("ignore", range),
                 // [...propNames]
-                TypeNode.createAssertionExpression(AssertionKind.AS, TypeNode.createArrayLiteralExpression(nameHashes.map((e) => TypeNode.createIntegerLiteralExpression(f64_as_i64(e), range)), range), TypeNode.createNamedType(TypeNode.createSimpleTypeName("StaticArray", range), [
-                    TypeNode.createNamedType(TypeNode.createSimpleTypeName("i64", range), null, false, range),
-                ], false, range), range),
+                TypeNode.createAssertionExpression(1 /* AssertionKind.AS */, TypeNode.createArrayLiteralExpression(nameHashes.map((e) => TypeNode.createIntegerLiteralExpression(f64_as_i64(e), range)), range), TypeNode.createNamedType(TypeNode.createSimpleTypeName("StaticArray", range), [TypeNode.createNamedType(TypeNode.createSimpleTypeName("i64", range), null, false, range)], false, range), range),
             ], range),
         ], range)),
     ], range), null, range);
@@ -113,15 +122,12 @@ function createIsDefinedIfStatement(nameHashes, range) {
 function pushKeyValueIfStatement(body, name, hashValue, range) {
     body.push(
     // if (!ignore.includes("propName")) { ... }
-    TypeNode.createIfStatement(TypeNode.createUnaryPrefixExpression(Token.EXCLAMATION,
+    TypeNode.createIfStatement(TypeNode.createUnaryPrefixExpression(95 /* Token.EXCLAMATION */,
     // ignore.includes("propName")
     TypeNode.createCallExpression(TypeNode.createPropertyAccessExpression(TypeNode.createIdentifierExpression("ignore", range), TypeNode.createIdentifierExpression("includes", range), range), null, [
         // hashValue
         TypeNode.createIntegerLiteralExpression(f64_as_i64(hashValue), range),
-    ], range), range), TypeNode.createBlockStatement([
-        createPushReflectedObjectKeyStatement(name, range),
-        createPushReflectedObjectValueStatement(name, range),
-    ], range), null, range));
+    ], range), range), TypeNode.createBlockStatement([createPushReflectedObjectKeyStatement(name, range), createPushReflectedObjectValueStatement(name, range)], range), null, range));
 }
 /**
  * Create a function call to __aspectPushReflectedObjectKey to add a key to a given
@@ -138,10 +144,7 @@ function createPushReflectedObjectKeyStatement(name, range) {
         // Reflect.toReflectedValue("propertyName", seen)
         TypeNode.createCallExpression(
         // Reflect.toReflectedValue
-        TypeNode.createPropertyAccessExpression(TypeNode.createIdentifierExpression("Reflect", range), TypeNode.createIdentifierExpression("toReflectedValue", range), range), null, [
-            TypeNode.createStringLiteralExpression(name, range),
-            TypeNode.createIdentifierExpression("seen", range),
-        ], range),
+        TypeNode.createPropertyAccessExpression(TypeNode.createIdentifierExpression("Reflect", range), TypeNode.createIdentifierExpression("toReflectedValue", range), range), null, [TypeNode.createStringLiteralExpression(name, range), TypeNode.createIdentifierExpression("seen", range)], range),
     ], range));
 }
 /**

package/lib/createStrictEqualsMember.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { AssertionKind, CommonFlags, NodeKind, ParameterKind, Token, TypeNode, } from "assemblyscript/dist/assemblyscript.js";
 import { djb2Hash } from "./hash.js";
+import { TypeNode, } from "assemblyscript/dist/assemblyscript.js";
 /**
  * This method creates a single FunctionDeclaration that allows Reflect.equals
  * to validate normal class member values.
@@ -9,9 +9,7 @@ import { djb2Hash } from "./hash.js";
 export function createStrictEqualsMember(classDeclaration) {
     const range = classDeclaration.name.range;
     // __aspectStrictEquals(ref: T, stackA: usize[], stackB: usize[], ignore: StaticArray<i64>): bool
-    return TypeNode.createMethodDeclaration(TypeNode.createIdentifierExpression("__aspectStrictEquals", range), null, CommonFlags.PUBLIC |
-        CommonFlags.INSTANCE |
-        (classDeclaration.isGeneric ? CommonFlags.GENERIC_CONTEXT : 0), null, TypeNode.createFunctionType([
+    return TypeNode.createMethodDeclaration(TypeNode.createIdentifierExpression("__aspectStrictEquals", range), null, 256 /* CommonFlags.PUBLIC */ | 262144 /* CommonFlags.INSTANCE */ | (classDeclaration.isGeneric ? 131072 /* CommonFlags.GENERIC_CONTEXT */ : 0), null, TypeNode.createFunctionType([
         // ref: T,
         createDefaultParameter("ref", TypeNode.createNamedType(TypeNode.createSimpleTypeName(classDeclaration.name.text, range), classDeclaration.isGeneric
             ? classDeclaration.typeParameters.map((node) => TypeNode.createNamedType(TypeNode.createSimpleTypeName(node.name.text, range), null, false, range))
@@ -23,9 +21,7 @@ export function createStrictEqualsMember(classDeclaration) {
         // cache: usize[]
         createDefaultParameter("cache", createArrayType("usize", range), range),
         // ignore: StaticArray<i64>
-        createDefaultParameter("ignore", TypeNode.createNamedType(TypeNode.createSimpleTypeName("StaticArray", range), [
-            TypeNode.createNamedType(TypeNode.createSimpleTypeName("i64", range), null, false, range),
-        ], false, range), range),
+        createDefaultParameter("ignore", TypeNode.createNamedType(TypeNode.createSimpleTypeName("StaticArray", range), [TypeNode.createNamedType(TypeNode.createSimpleTypeName("i64", range), null, false, range)], false, range), range),
     ],
     // : bool
     createSimpleNamedType("bool", range), null, false, range), createStrictEqualsFunctionBody(classDeclaration), range);
@@ -45,9 +41,7 @@ function createSimpleNamedType(name, range) {
  * @param {Range} range - The source range.
  */
 function createArrayType(name, range) {
-    return TypeNode.createNamedType(TypeNode.createSimpleTypeName("Array", range), [
-        TypeNode.createNamedType(TypeNode.createSimpleTypeName(name, range), null, false, range),
-    ], false, range);
+    return TypeNode.createNamedType(TypeNode.createSimpleTypeName("Array", range), [TypeNode.createNamedType(TypeNode.createSimpleTypeName(name, range), null, false, range)], false, range);
 }
 /**
  * This method creates the entire function body for __aspectStrictEquals.
@@ -61,10 +55,10 @@ function createStrictEqualsFunctionBody(classDeclaration) {
     // for each field declaration, generate a check
     for (const member of classDeclaration.members) {
         // if it's an instance member, regardless of access modifier
-        if (member.is(CommonFlags.INSTANCE)) {
+        if (member.is(262144 /* CommonFlags.INSTANCE */)) {
             switch (member.kind) {
                 // field declarations automatically get added
-                case NodeKind.FIELDDECLARATION: {
+                case 54 /* NodeKind.FIELDDECLARATION */: {
                     const fieldDeclaration = member;
                     const hashValue = djb2Hash(member.name.text);
                     body.push(createStrictEqualsIfCheck(member.name.text, hashValue, fieldDeclaration.range));
@@ -72,8 +66,8 @@ function createStrictEqualsFunctionBody(classDeclaration) {
                     break;
                 }
                 // function declarations can be getters, check the get flag
-                case NodeKind.METHODDECLARATION: {
-                    if (member.is(CommonFlags.GET)) {
+                case 58 /* NodeKind.METHODDECLARATION */: {
+                    if (member.is(2048 /* CommonFlags.GET */)) {
                         const methodDeclaration = member;
                         const hashValue = djb2Hash(member.name.text);
                         body.push(createStrictEqualsIfCheck(methodDeclaration.name.text, hashValue, methodDeclaration.name.range));
@@ -98,7 +92,7 @@ function createStrictEqualsFunctionBody(classDeclaration) {
  * @param {Range} range - The source range for the given property.
  */
 function createStrictEqualsIfCheck(name, hashValue, range) {
-    const equalsCheck = TypeNode.createBinaryExpression(Token.EQUALS_EQUALS,
+    const equalsCheck = TypeNode.createBinaryExpression(76 /* Token.EQUALS_EQUALS */,
     // Reflect.equals(this.prop, ref.prop, stack, cache)
     TypeNode.createCallExpression(
     // Reflect.equals
@@ -115,7 +109,7 @@ function createStrictEqualsIfCheck(name, hashValue, range) {
         TypeNode.createIdentifierExpression("cache", range),
     ], range), createPropertyAccess("Reflect", "FAILED_MATCH", range), range);
     // !ignore.includes("prop")
-    const includesCheck = TypeNode.createUnaryPrefixExpression(Token.EXCLAMATION,
+    const includesCheck = TypeNode.createUnaryPrefixExpression(95 /* Token.EXCLAMATION */,
     // ignore.includes("prop")
     TypeNode.createCallExpression(
     // ignore.includes
@@ -125,7 +119,7 @@ function createStrictEqualsIfCheck(name, hashValue, range) {
     // if (Reflect.equals(this.prop, ref.prop, stack, cache) === Reflect.FAILED_MATCH) return false;
     return TypeNode.createIfStatement(
     // Reflect.equals(this.prop, ref.prop, stack, cache) === Reflect.FAILED_MATCH
-    TypeNode.createBinaryExpression(Token.AMPERSAND_AMPERSAND, includesCheck, equalsCheck, range),
+    TypeNode.createBinaryExpression(97 /* Token.AMPERSAND_AMPERSAND */, includesCheck, equalsCheck, range),
     // return false;
     TypeNode.createReturnStatement(TypeNode.createFalseExpression(range), range), null, range);
 }
@@ -137,7 +131,7 @@ function createStrictEqualsIfCheck(name, hashValue, range) {
  * @param {Range} range - The source range of the parameter.
  */
 function createDefaultParameter(name, typeNode, range) {
-    return TypeNode.createParameter(ParameterKind.DEFAULT, TypeNode.createIdentifierExpression(name, range), typeNode, null, range);
+    return TypeNode.createParameter(0 /* ParameterKind.DEFAULT */, TypeNode.createIdentifierExpression(name, range), typeNode, null, range);
 }
 /**
  * This method creates a single property access and passes the given range to the AST.
@@ -162,7 +156,7 @@ function createSuperCallStatement(classDeclaration, nameHashes) {
     const ifStatement = TypeNode.createIfStatement(TypeNode.createCallExpression(TypeNode.createIdentifierExpression("isDefined", range), null, [
         TypeNode.createPropertyAccessExpression(TypeNode.createSuperExpression(range), TypeNode.createIdentifierExpression("__aspectStrictEquals", range), range),
     ], range), TypeNode.createBlockStatement([
-        TypeNode.createIfStatement(TypeNode.createUnaryPrefixExpression(Token.EXCLAMATION, createSuperCallExpression(nameHashes, range), range), TypeNode.createReturnStatement(TypeNode.createFalseExpression(range), range), null, range),
+        TypeNode.createIfStatement(TypeNode.createUnaryPrefixExpression(95 /* Token.EXCLAMATION */, createSuperCallExpression(nameHashes, range), range), TypeNode.createReturnStatement(TypeNode.createFalseExpression(range), range), null, range),
     ], range), null, range);
     return ifStatement;
 }
@@ -181,9 +175,7 @@ function createSuperCallExpression(hashValues, range) {
         TypeNode.createCallExpression(TypeNode.createPropertyAccessExpression(TypeNode.createIdentifierExpression("StaticArray", range), TypeNode.createIdentifierExpression("concat", range), range), null, [
             TypeNode.createIdentifierExpression("ignore", range),
             // [...] as StaticArray<i64>
-            TypeNode.createAssertionExpression(AssertionKind.AS, TypeNode.createArrayLiteralExpression(hashValues.map((e) => TypeNode.createIntegerLiteralExpression(f64_as_i64(e), range)), range), TypeNode.createNamedType(TypeNode.createSimpleTypeName("StaticArray", range), [
-                TypeNode.createNamedType(TypeNode.createSimpleTypeName("i64", range), null, false, range),
-            ], false, range), range),
+            TypeNode.createAssertionExpression(1 /* AssertionKind.AS */, TypeNode.createArrayLiteralExpression(hashValues.map((e) => TypeNode.createIntegerLiteralExpression(f64_as_i64(e), range)), range), TypeNode.createNamedType(TypeNode.createSimpleTypeName("StaticArray", range), [TypeNode.createNamedType(TypeNode.createSimpleTypeName("i64", range), null, false, range)], false, range), range),
         ], range),
     ], range);
 }

package/lib/emptyTransformer.js CHANGED Viewed

@@ -6,4 +6,3 @@ export default class AspectTransform extends Transform {
     // @ts-ignore
     afterParse(_parser) { }
 }
-;

package/lib/index.js CHANGED Viewed

@@ -1,6 +1,4 @@
-// import { Transform } from "assemblyscript/cli/transform";
-import { NodeKind, } from "assemblyscript/dist/assemblyscript.js";
-import { Transform, } from "assemblyscript/dist/transform.js";
+import { Transform } from "assemblyscript/dist/transform.js";
 import { createStrictEqualsMember } from "./createStrictEqualsMember.js";
 import { createAddReflectedValueKeyValuePairsMember } from "./createAddReflectedValueKeyValuePairsMember.js";
 // @ts-ignore
@@ -23,18 +21,17 @@ export default class AspectTransform extends Transform {
         }
     }
 }
-;
 function traverseStatements(statements) {
     // for each statement in the source
     for (const statement of statements) {
         // find each class declaration
-        if (statement.kind === NodeKind.CLASSDECLARATION) {
+        if (statement.kind === 51 /* NodeKind.CLASSDECLARATION */) {
             // cast and create a strictEquals function
             const classDeclaration = statement;
             classDeclaration.members.push(createStrictEqualsMember(classDeclaration));
             classDeclaration.members.push(createAddReflectedValueKeyValuePairsMember(classDeclaration));
         }
-        else if (statement.kind === NodeKind.NAMESPACEDECLARATION) {
+        else if (statement.kind === 59 /* NodeKind.NAMESPACEDECLARATION */) {
             const namespaceDeclaration = statement;
             traverseStatements(namespaceDeclaration.members);
         }

package/package.json CHANGED Viewed

@@ -1,18 +1,19 @@
 {
   "name": "@as-pect/transform",
-  "version": "6.2.4",
+  "version": "7.0.0",
   "description": "The transform used by the as-pect core and assembly packages to enable strict equality.",
   "main": "lib/index.js",
+  "type": "module",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "tsc:all": "tsc"
   },
-  "author": "",
-  "license": "ISC",
-  "peerDependencies": {
-    "assemblyscript": "^0.21.1"
+  "author": "Joshua Tenner <tenner.joshua@gmail.com>",
+  "license": "MIT",
+  "dependencies": {
+    "assemblyscript": "^0.21.2"
   },
   "devDependencies": {
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.2"
   },
   "files": [
     "lib/",

package/lib/transform.js DELETED Viewed

@@ -1,7 +0,0 @@
-'use strict';
-module.exports = transform;
-function transform() {
-    return "Hello from transform";
-}