@jay-framework/compiler-shared 0.15.4 → 0.15.6

package/dist/index.d.ts

@@ -129,9 +129,10 @@ declare enum JayTypeKind {
     object = 8,
     array = 9,
     union = 10,
-    promise = 11,
-    recursive = 12,
-    optional = 13
+    record = 11,
+    promise = 12,
+    recursive = 13,
+    optional = 14
 }
 interface JayType {
     name: string;
@@ -157,6 +158,7 @@ declare class JayEnumType implements JayType {
     readonly name: string;
     readonly values: Array<string>;
     constructor(name: string, values: Array<string>);
+    alias?: string;
     readonly kind = JayTypeKind.enum;
 }
 declare class JayHTMLType implements JayType {
@@ -209,6 +211,12 @@ declare class JayArrayType implements JayType {
     get name(): string;
     readonly kind = JayTypeKind.array;
 }
+declare class JayRecordType implements JayType {
+    readonly itemType: JayType;
+    constructor(itemType: JayType);
+    get name(): string;
+    readonly kind = JayTypeKind.record;
+}
 declare class JayUnionType implements JayType {
     readonly ofTypes: JayType[];
     constructor(ofTypes: JayType[]);
@@ -247,6 +255,7 @@ declare function isElementType(aType: JayType): aType is JayElementType;
 declare function isComponentType(aType: JayType): aType is JayComponentType;
 declare function isObjectType(aType: JayType): aType is JayObjectType;
 declare function isArrayType(aType: JayType): aType is JayArrayType;
+declare function isRecordType(aType: JayType): aType is JayRecordType;
 declare function isUnionType(aType: JayType): aType is JayUnionType;
 declare function isPromiseType(aType: JayType): aType is JayPromiseType;
 declare function isRecursiveType(aType: JayType): aType is JayRecursiveType;
@@ -269,6 +278,7 @@ interface JsonSchemaProperty {
     description?: string;
     enum?: string[];
     items?: JsonSchemaProperty;
+    additionalProperties?: JsonSchemaProperty;
     properties?: Record<string, JsonSchemaProperty>;
     required?: string[];
 }
@@ -577,6 +587,20 @@ interface PluginManifest {
     actions?: ActionManifestEntry[];
     /** Plugin initialization configuration */
     init?: PluginInitConfig;
+    /** Server-side services provided by this plugin (DL#125) */
+    services?: Array<{
+        name: string;
+        marker: string;
+        description?: string;
+        doc?: string;
+    }>;
+    /** Client-side contexts provided by this plugin (DL#125) */
+    contexts?: Array<{
+        name: string;
+        marker: string;
+        description?: string;
+        doc?: string;
+    }>;
     /** Plugin setup configuration (Design Log #87) */
     setup?: {
         /** Export name (NPM) or relative path (local) to setup handler function */
@@ -739,4 +763,4 @@ declare function compileForEachInstanceKeyExpr(coordinateSuffix: string, trackBy
  */
 declare function computeForEachInstanceKey(trackByValue: string, coordinateSuffix: string): string;
 
-export { type ActionManifestEntry, CSS_EXTENSION, type CompilerSourceFile, type DynamicContractConfig, GenerateTarget, type GenericTypescriptSourceFile, Import, type ImportName, type ImportedRefsTree, Imports, ImportsFor, JAY_4_REACT, JAY_ACTION_DTS_EXTENSION, JAY_ACTION_EXTENSION, JAY_COMPONENT, JAY_CONTRACT_DTS_EXTENSION, JAY_CONTRACT_EXTENSION, JAY_DTS_EXTENSION, JAY_EXTENSION, JAY_FULLSTACK_COMPONENTS, JAY_QUERY_CLIENT, JAY_QUERY_HYDRATE, JAY_QUERY_MAIN_SANDBOX, JAY_QUERY_MAIN_SANDBOX_TS, JAY_QUERY_PREFIX, JAY_QUERY_SERVER, JAY_QUERY_WORKER_SANDBOX, JAY_QUERY_WORKER_SANDBOX_TS, JAY_QUERY_WORKER_TRUSTED, JAY_QUERY_WORKER_TRUSTED_TS, JAY_RUNTIME, JAY_SECURE, JAY_SSR_RUNTIME, JAY_STACK_CLIENT_RUNTIME, JAY_TS_EXTENSION, JayArrayType, JayAtomicType, JayBoolean, JayBuildEnvironment, JayComponentApiMember, JayComponentType, JayDate, JayElementConstructorType, JayElementType, JayEnumType, type JayEnvironment, JayErrorType, JayHTMLType, type JayImportLink, type JayImportName, JayImportedType, JayNumber, JayObjectType, JayOptionalType, JayPromiseType, JayRecursiveType, JayString, type JayType, JayTypeAlias, JayTypeKind, JayUnionType, JayUnknown, type JayValidations, type JsonSchemaProperty, LOCAL_PLUGIN_PATH, MAKE_JAY_4_REACT_COMPONENT, MAKE_JAY_COMPONENT, MAKE_JAY_TSX_COMPONENT, type MainRuntimeModes, type ParsedJayModuleSpecifier, type PluginComponentResolution, type PluginInitConfig, type PluginManifest, REACT, type RecursiveRegion, type Ref, type RefsTree, RenderFragment, RuntimeMode, SourceFileFormat, TSX_EXTENSION, TS_EXTENSION, WithValidations, addBuildEnvironment, checkValidationErrors, compileCoordinateExpr, compileForEachInstanceKeyExpr, computeForEachInstanceKey, computeInstanceKey, equalJayTypes, findDynamicContract, getBasePath, getBuildEnvironment, getJayTsFileSourcePath, getMode, getModeFileExtension, getModeFromExtension, hasBuildEnvironment, hasExtension, hasJayExtension, hasJayModeExtension, hasRefs, isArrayType, isAtomicType, isComponentType, isCurrencyType, isDateWithTimezoneType, isElementConstructorType, isElementType, isEnumType, isHTMLType, isImportedType, isLocalModule, isObjectType, isOptionalType, isPromiseType, isRecursiveType, isStaticCoordinate, isTypeAliasType, isUnionType, jayTypeToJsonSchema, loadPluginManifest, mergeRefsTrees, mkRef, mkRefsTree, nestRefs, normalizeActionEntry, parseJayModuleSpecifier, prettify, prettifyHtml, removeComments, resolvePluginComponent, resolvePluginManifest, resolvePrimitiveType, withOriginalTrace, withoutExtension };
+export { type ActionManifestEntry, CSS_EXTENSION, type CompilerSourceFile, type DynamicContractConfig, GenerateTarget, type GenericTypescriptSourceFile, Import, type ImportName, type ImportedRefsTree, Imports, ImportsFor, JAY_4_REACT, JAY_ACTION_DTS_EXTENSION, JAY_ACTION_EXTENSION, JAY_COMPONENT, JAY_CONTRACT_DTS_EXTENSION, JAY_CONTRACT_EXTENSION, JAY_DTS_EXTENSION, JAY_EXTENSION, JAY_FULLSTACK_COMPONENTS, JAY_QUERY_CLIENT, JAY_QUERY_HYDRATE, JAY_QUERY_MAIN_SANDBOX, JAY_QUERY_MAIN_SANDBOX_TS, JAY_QUERY_PREFIX, JAY_QUERY_SERVER, JAY_QUERY_WORKER_SANDBOX, JAY_QUERY_WORKER_SANDBOX_TS, JAY_QUERY_WORKER_TRUSTED, JAY_QUERY_WORKER_TRUSTED_TS, JAY_RUNTIME, JAY_SECURE, JAY_SSR_RUNTIME, JAY_STACK_CLIENT_RUNTIME, JAY_TS_EXTENSION, JayArrayType, JayAtomicType, JayBoolean, JayBuildEnvironment, JayComponentApiMember, JayComponentType, JayDate, JayElementConstructorType, JayElementType, JayEnumType, type JayEnvironment, JayErrorType, JayHTMLType, type JayImportLink, type JayImportName, JayImportedType, JayNumber, JayObjectType, JayOptionalType, JayPromiseType, JayRecordType, JayRecursiveType, JayString, type JayType, JayTypeAlias, JayTypeKind, JayUnionType, JayUnknown, type JayValidations, type JsonSchemaProperty, LOCAL_PLUGIN_PATH, MAKE_JAY_4_REACT_COMPONENT, MAKE_JAY_COMPONENT, MAKE_JAY_TSX_COMPONENT, type MainRuntimeModes, type ParsedJayModuleSpecifier, type PluginComponentResolution, type PluginInitConfig, type PluginManifest, REACT, type RecursiveRegion, type Ref, type RefsTree, RenderFragment, RuntimeMode, SourceFileFormat, TSX_EXTENSION, TS_EXTENSION, WithValidations, addBuildEnvironment, checkValidationErrors, compileCoordinateExpr, compileForEachInstanceKeyExpr, computeForEachInstanceKey, computeInstanceKey, equalJayTypes, findDynamicContract, getBasePath, getBuildEnvironment, getJayTsFileSourcePath, getMode, getModeFileExtension, getModeFromExtension, hasBuildEnvironment, hasExtension, hasJayExtension, hasJayModeExtension, hasRefs, isArrayType, isAtomicType, isComponentType, isCurrencyType, isDateWithTimezoneType, isElementConstructorType, isElementType, isEnumType, isHTMLType, isImportedType, isLocalModule, isObjectType, isOptionalType, isPromiseType, isRecordType, isRecursiveType, isStaticCoordinate, isTypeAliasType, isUnionType, jayTypeToJsonSchema, loadPluginManifest, mergeRefsTrees, mkRef, mkRefsTree, nestRefs, normalizeActionEntry, parseJayModuleSpecifier, prettify, prettifyHtml, removeComments, resolvePluginComponent, resolvePluginManifest, resolvePrimitiveType, withOriginalTrace, withoutExtension };

package/dist/index.js

@@ -572,9 +572,10 @@ var JayTypeKind = /* @__PURE__ */ ((JayTypeKind2) => {
   JayTypeKind2[JayTypeKind2["object"] = 8] = "object";
   JayTypeKind2[JayTypeKind2["array"] = 9] = "array";
   JayTypeKind2[JayTypeKind2["union"] = 10] = "union";
-  JayTypeKind2[JayTypeKind2["promise"] = 11] = "promise";
-  JayTypeKind2[JayTypeKind2["recursive"] = 12] = "recursive";
-  JayTypeKind2[JayTypeKind2["optional"] = 13] = "optional";
+  JayTypeKind2[JayTypeKind2["record"] = 11] = "record";
+  JayTypeKind2[JayTypeKind2["promise"] = 12] = "promise";
+  JayTypeKind2[JayTypeKind2["recursive"] = 13] = "recursive";
+  JayTypeKind2[JayTypeKind2["optional"] = 14] = "optional";
   return JayTypeKind2;
 })(JayTypeKind || {});
 class JayAtomicType {
@@ -605,6 +606,7 @@ class JayTypeAlias {
 }
 class JayEnumType {
   constructor(name, values) {
+    __publicField(this, "alias");
     __publicField(this, "kind", 2);
     this.name = name;
     this.values = values;
@@ -666,6 +668,15 @@ class JayArrayType {
     return `Array<${this.itemType.name}>`;
   }
 }
+class JayRecordType {
+  constructor(itemType) {
+    __publicField(this, "kind", 11);
+    this.itemType = itemType;
+  }
+  get name() {
+    return `Record<string, ${this.itemType.name}>`;
+  }
+}
 class JayUnionType {
   constructor(ofTypes) {
     __publicField(this, "kind", 10);
@@ -680,7 +691,7 @@ class JayUnionType {
 }
 class JayPromiseType {
   constructor(itemType) {
-    __publicField(this, "kind", 11);
+    __publicField(this, "kind", 12);
     this.itemType = itemType;
   }
   get name() {
@@ -689,7 +700,7 @@ class JayPromiseType {
 }
 class JayRecursiveType {
   constructor(referencePath, resolvedType) {
-    __publicField(this, "kind", 12);
+    __publicField(this, "kind", 13);
     this.referencePath = referencePath;
     this.resolvedType = resolvedType;
   }
@@ -699,7 +710,7 @@ class JayRecursiveType {
 }
 class JayOptionalType {
   constructor(innerType) {
-    __publicField(this, "kind", 13);
+    __publicField(this, "kind", 14);
     this.innerType = innerType;
   }
   get name() {
@@ -712,7 +723,7 @@ const JayErrorType = new JayObjectType("Error", {
   stack: new JayAtomicType("string")
 });
 function isOptionalType(aType) {
-  return aType.kind === 13;
+  return aType.kind === 14;
 }
 function isAtomicType(aType) {
   return aType.kind === 0;
@@ -744,14 +755,17 @@ function isObjectType(aType) {
 function isArrayType(aType) {
   return aType.kind === 9;
 }
+function isRecordType(aType) {
+  return aType.kind === 11;
+}
 function isUnionType(aType) {
   return aType.kind === 10;
 }
 function isPromiseType(aType) {
-  return aType.kind === 11;
+  return aType.kind === 12;
 }
 function isRecursiveType(aType) {
-  return aType.kind === 12;
+  return aType.kind === 13;
 }
 function isCurrencyType(aType) {
   return aType.kind === 0 && aType.name === "Currency";
@@ -771,6 +785,8 @@ function equalJayTypes(a, b) {
     );
   else if (a instanceof JayArrayType && b instanceof JayArrayType)
     return equalJayTypes(a.itemType, b.itemType);
+  else if (a instanceof JayRecordType && b instanceof JayRecordType)
+    return equalJayTypes(a.itemType, b.itemType);
   else if (a instanceof JayTypeAlias && b instanceof JayTypeAlias)
     return true;
   else if (a instanceof JayHTMLType && b instanceof JayHTMLType)
@@ -825,6 +841,13 @@ function jayTypeToJsonSchema(type) {
     }
     return { type: "array" };
   }
+  if (isRecordType(type)) {
+    const valueSchema = jayTypeToJsonSchema(type.itemType);
+    if (valueSchema) {
+      return { type: "object", additionalProperties: valueSchema };
+    }
+    return { type: "object" };
+  }
   if (isObjectType(type)) {
     const properties = {};
     const required = [];
@@ -1137,7 +1160,21 @@ var SourceFileFormat = /* @__PURE__ */ ((SourceFileFormat2) => {
   return SourceFileFormat2;
 })(SourceFileFormat || {});
 function mergeRefsTrees(...trees) {
-  const allRefs = trees.flatMap((tree) => tree.refs);
+  const refsByConstName = /* @__PURE__ */ new Map();
+  const refsWithoutConstName = [];
+  for (const tree of trees) {
+    for (const ref of tree.refs) {
+      if (ref.constName == null) {
+        refsWithoutConstName.push(ref);
+      } else {
+        const existing = refsByConstName.get(ref.constName);
+        if (!existing || !existing.repeated && ref.repeated) {
+          refsByConstName.set(ref.constName, ref);
+        }
+      }
+    }
+  }
+  const allRefs = [...refsWithoutConstName, ...refsByConstName.values()];
   const allChildren = {};
   const allKeys = new Set(trees.flatMap((tree) => Object.keys(tree.children)));
   for (const key of allKeys) {
@@ -1650,6 +1687,7 @@ export {
   JayObjectType,
   JayOptionalType,
   JayPromiseType,
+  JayRecordType,
   JayRecursiveType,
   JayString,
   JayTypeAlias,
@@ -1701,6 +1739,7 @@ export {
   isObjectType,
   isOptionalType,
   isPromiseType,
+  isRecordType,
   isRecursiveType,
   isStaticCoordinate,
   isTypeAliasType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/compiler-shared",
-  "version": "0.15.4",
+  "version": "0.15.6",
   "type": "module",
   "description": "",
   "license": "Apache-2.0",
@@ -25,10 +25,10 @@
   },
   "author": "",
   "dependencies": {
-    "@jay-framework/component": "^0.15.4",
-    "@jay-framework/runtime": "^0.15.4",
-    "@jay-framework/secure": "^0.15.4",
-    "@jay-framework/typescript-bridge": "^0.15.4",
+    "@jay-framework/component": "^0.15.6",
+    "@jay-framework/runtime": "^0.15.6",
+    "@jay-framework/secure": "^0.15.6",
+    "@jay-framework/typescript-bridge": "^0.15.6",
     "@types/js-yaml": "^4.0.9",
     "change-case": "^4.1.2",
     "js-beautify": "^1.14.11",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@caiogondim/strip-margin": "^1.0.0",
-    "@jay-framework/dev-environment": "^0.15.4",
+    "@jay-framework/dev-environment": "^0.15.6",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/js-beautify": "^1",
     "@types/node": "^20.11.5",