@telorun/assert 0.1.4 → 0.1.5

package/dist/module-context.d.ts

@@ -5,10 +5,12 @@ export declare const schema: import("@sinclair/typebox").TObject<{
         name: import("@sinclair/typebox").TString;
         module: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     }>;
-    imports: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
+    resources: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
         variables: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
         secrets: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
     }>>>;
+    variables: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
+    secrets: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
 }>;
 type ModuleContextManifest = Static<typeof schema>;
 export declare function create(manifest: ModuleContextManifest, ctx: ResourceContext): Promise<Runnable>;

package/dist/module-context.js

@@ -8,7 +8,9 @@ export const schema = Type.Object({
         name: Type.String(),
         module: Type.Optional(Type.String()),
     }),
-    imports: Type.Optional(Type.Record(Type.String(), ImportEntry)),
+    resources: Type.Optional(Type.Record(Type.String(), ImportEntry)),
+    variables: Type.Optional(Type.Record(Type.String(), Type.Any())),
+    secrets: Type.Optional(Type.Record(Type.String(), Type.Any())),
 });
 const useColor = process.stderr.isTTY;
 const c = (code, text) => (useColor ? `\x1b[${code}m${text}\x1b[0m` : text);
@@ -38,56 +40,45 @@ export async function create(manifest, ctx) {
     return {
         run: async () => {
             const declaringModule = manifest.metadata.module ?? "default";
-            const importsToCheck = manifest.imports ?? {};
+            const resourcesToCheck = manifest.resources ?? {};
             const failures = [];
             const passed = [];
-            for (const [alias, expected] of Object.entries(importsToCheck)) {
-                const realModule = ctx.resolveModuleAlias(declaringModule, alias);
-                if (!realModule) {
+            const { resources } = ctx.moduleContext;
+            for (const [alias, expected] of Object.entries(resourcesToCheck)) {
+                if (!ctx.resolveModuleAlias(declaringModule, alias)) {
                     failures.push(`Import alias '${alias}' not found in module '${declaringModule}'`);
                     continue;
                 }
-                const moduleCtx = ctx.moduleContext;
-                const importSnap = moduleCtx.resources[alias] ?? {};
-                const expectedVariables = expected.variables ?? {};
-                const expectedSecrets = expected.secrets ?? {};
-                for (const [key, expectedValue] of Object.entries(expectedVariables)) {
-                    const actualValue = importSnap?.variables?.[key];
-                    if (!deepEqual(actualValue, expectedValue)) {
-                        failures.push(`imports.${alias}.variables.${key}: expected ${yellow(JSON.stringify(expectedValue))}, got ${red(JSON.stringify(actualValue))}`);
+                const snap = resources[alias] ?? {};
+                const path = `resources.${alias}`;
+                for (const [key, expectedValue] of Object.entries(expected.variables ?? {})) {
+                    const actual = snap?.variables?.[key];
+                    if (deepEqual(actual, expectedValue)) {
+                        passed.push(`${path}.variables.${key}`);
                     }
                     else {
-                        passed.push(`imports.${alias}.variables.${key}`);
+                        failures.push(`${path}.variables.${key}: expected ${yellow(JSON.stringify(expectedValue))}, got ${red(JSON.stringify(actual))}`);
                     }
                 }
-                for (const [key] of Object.entries(expectedSecrets)) {
-                    const actualSecret = importSnap?.secrets?.[key];
-                    if (!deepEqual(actualSecret, expectedSecrets[key])) {
-                        failures.push(`imports.${alias}.secrets.${key}: ${dim("value mismatch")}`);
+                for (const [key, expectedValue] of Object.entries(expected.secrets ?? {})) {
+                    const actual = snap?.secrets?.[key];
+                    if (deepEqual(actual, expectedValue)) {
+                        passed.push(`${path}.secrets.${key}`);
                     }
                     else {
-                        passed.push(`imports.${alias}.secrets.${key}`);
+                        failures.push(`${path}.secrets.${key}: ${dim("value mismatch")}`);
                     }
                 }
             }
             const name = manifest.metadata.name;
+            const passedLines = passed.map((p) => `  ${green("✓")} ${dim(p)}\n`).join("");
             if (failures.length > 0) {
-                let report = bold(red(`Assert.ModuleContext.${name}: assertion failed`)) + "\n";
-                for (const p of passed) {
-                    report += `  ${green("✓")} ${dim(p)}\n`;
-                }
-                for (const f of failures) {
-                    report += `  ${red("✗")} ${f}\n`;
-                }
-                process.stderr.write(report);
+                const failedLines = failures.map((f) => `  ${red("✗")} ${f}\n`).join("");
+                process.stderr.write(bold(red(`Assert.ModuleContext.${name}: assertion failed`)) + "\n" + passedLines + failedLines);
                 ctx.requestExit(1);
             }
             else {
-                let report = bold(green(`Assert.ModuleContext.${name}: assertion passed`)) + "\n";
-                for (const p of passed) {
-                    report += `  ${green("✓")} ${dim(p)}\n`;
-                }
-                process.stdout.write(report);
+                process.stdout.write(bold(green(`Assert.ModuleContext.${name}: assertion passed`)) + "\n" + passedLines);
             }
         },
     };

package/dist/schema.d.ts

@@ -1,6 +1,9 @@
 import { ResourceContext } from "@telorun/sdk";
 import { Static } from "@sinclair/typebox";
 export declare const schema: import("@sinclair/typebox").TObject<{
+    metadata: import("@sinclair/typebox").TObject<{
+        name: import("@sinclair/typebox").TString;
+    }>;
     schema: import("@sinclair/typebox").TObject<{
         type: import("@sinclair/typebox").TString;
     }>;

package/dist/schema.js

@@ -1,15 +1,32 @@
 import { Type } from "@sinclair/typebox";
 export const schema = Type.Object({
+    metadata: Type.Object({
+        name: Type.String(),
+    }),
     schema: Type.Object({
         type: Type.String(),
     }),
-}, {});
+});
+const useColor = process.stderr.isTTY;
+const c = (code, text) => (useColor ? `\x1b[${code}m${text}\x1b[0m` : text);
+const bold = (t) => c("1", t);
+const red = (t) => c("31", t);
+const green = (t) => c("32", t);
+const dim = (t) => c("2", t);
 export async function create(manifest, ctx) {
     const validator = ctx.createSchemaValidator(manifest.schema);
+    const name = manifest.metadata.name;
     return {
         invoke: (data) => {
-            validator.validate(data);
-            return true;
+            try {
+                validator.validate(data);
+                process.stdout.write(bold(green(`Assert.Schema.${name}: assertion passed`)) + "\n" + `  ${green("✓")} ${dim(JSON.stringify(data))}\n`);
+                return true;
+            }
+            catch (err) {
+                process.stderr.write(bold(red(`Assert.Schema.${name}: assertion failed`)) + "\n" + `  ${red("✗")} ${err?.message ?? String(err)}\n`);
+                throw err;
+            }
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/assert",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "exports": {
     "./schema": "./src/schema.ts",
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "@sinclair/typebox": "^0.34.48",
-    "@telorun/sdk": "0.2.5"
+    "@telorun/sdk": "0.2.6"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",