@anvil-works/anvil-cli 0.8.0-canary.3 → 0.8.0-canary.4

package/dist/cli.js

@@ -15863,7 +15863,8 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         if (PYTHON_KEYWORDS.has(value)) pushIssue(issues, path, "must be a valid Python identifier (not a keyword)");
     }
     const componentTypeSpec_IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
-    const DEP_ID_RE = /^dep_[A-Za-z0-9]+$/;
+    const LEGACY_CUSTOM_COMPONENT_SPEC_RE = /^form:(?:([^:]+):)?(.+)$/;
+    const PACKAGE_QUALIFIED_FORM_NAME_RE = /^([^.]+)\.(.+)$/;
     const componentTypeSpec_PYTHON_KEYWORDS = new Set([
         "False",
         "None",
@@ -15903,32 +15904,17 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         "match",
         "case"
     ]);
-    const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form)";
+    const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form, form:APP_ID:Package.Form)";
     const COMPONENT_TYPE_REFERENCE_MESSAGE = "must be a known Anvil component type (see componentIcons.ts), a form: reference, or a package-qualified form reference (Package.Form)";
     function isValidIdentifierSegment(value) {
         return value.length > 0 && componentTypeSpec_IDENTIFIER_RE.test(value) && !componentTypeSpec_PYTHON_KEYWORDS.has(value);
     }
     function isValidLegacyFormTypeReference(typeName) {
-        if (!typeName.startsWith("form:")) return false;
-        const rest = typeName.slice(5);
-        if (0 === rest.length) return false;
-        let classPath = rest;
-        if (rest.startsWith("dep_")) {
-            const splitIndex = rest.indexOf(":");
-            if (splitIndex <= 0) return false;
-            const depId = rest.slice(0, splitIndex);
-            if (!DEP_ID_RE.test(depId)) return false;
-            classPath = rest.slice(splitIndex + 1);
-        }
-        if (0 === classPath.length) return false;
-        return classPath.split(".").every((part)=>isValidIdentifierSegment(part));
+        return LEGACY_CUSTOM_COMPONENT_SPEC_RE.test(typeName);
     }
     function isValidPackageQualifiedComponentType(typeName) {
         if (typeName.startsWith("anvil.")) return false;
-        if (!typeName.includes(".")) return false;
-        const parts = typeName.split(".");
-        if (parts.length < 2) return false;
-        return parts.every((part)=>isValidIdentifierSegment(part));
+        return PACKAGE_QUALIFIED_FORM_NAME_RE.test(typeName);
     }
     function componentTypeSpec_pushIssue(issues, path, message) {
         issues.push({
@@ -16037,7 +16023,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             const bindingPath = `${path}[${index}]`;
             if (!isPlainObject(binding)) return void formTemplateValidation_pushIssue(issues, bindingPath, "must be an object");
             if ("string" != typeof binding.property || 0 === binding.property.length) formTemplateValidation_pushIssue(issues, `${bindingPath}.property`, "must be a non-empty string");
-            if ("string" != typeof binding.code || 0 === binding.code.length) formTemplateValidation_pushIssue(issues, `${bindingPath}.code`, "must be a non-empty string");
+            if ("string" != typeof binding.code) formTemplateValidation_pushIssue(issues, `${bindingPath}.code`, "must be a string");
             if (void 0 !== binding.writeback && "boolean" != typeof binding.writeback) formTemplateValidation_pushIssue(issues, `${bindingPath}.writeback`, "must be a boolean");
         });
     }

package/dist/componentTypeSpec.d.ts

@@ -1,5 +1,5 @@
 import type { ValidationIssue } from "./validators";
-export declare const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form)";
+export declare const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form, form:APP_ID:Package.Form)";
 export declare const COMPONENT_TYPE_REFERENCE_MESSAGE = "must be a known Anvil component type (see componentIcons.ts), a form: reference, or a package-qualified form reference (Package.Form)";
 export declare function isValidLegacyFormTypeReference(typeName: string): boolean;
 export declare function isValidPackageQualifiedComponentType(typeName: string): boolean;

package/dist/componentTypeSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"componentTypeSpec.d.ts","sourceRoot":"","sources":["../src/componentTypeSpec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AA6CpD,eAAO,MAAM,kCAAkC,kFACoC,CAAC;AAEpF,eAAO,MAAM,gCAAgC,0IAC8F,CAAC;AAM5I,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CA0BxE;AAED,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAY9E;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,yBAAyB,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CAWlH;AAMD,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,eAAe,EAAE,EACzB,yBAAyB,EAAE,WAAW,CAAC,MAAM,CAAC,QAwBjD"}
+{"version":3,"file":"componentTypeSpec.d.ts","sourceRoot":"","sources":["../src/componentTypeSpec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AA8CpD,eAAO,MAAM,kCAAkC,4GAC8D,CAAC;AAE9G,eAAO,MAAM,gCAAgC,0IAC8F,CAAC;AAM5I,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExE;AAED,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAK9E;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,yBAAyB,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CAWlH;AAMD,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,eAAe,EAAE,EACzB,yBAAyB,EAAE,WAAW,CAAC,MAAM,CAAC,QAwBjD"}

package/dist/index.js

@@ -15892,7 +15892,8 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         if (PYTHON_KEYWORDS.has(value)) pushIssue(issues, path, "must be a valid Python identifier (not a keyword)");
     }
     const componentTypeSpec_IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
-    const DEP_ID_RE = /^dep_[A-Za-z0-9]+$/;
+    const LEGACY_CUSTOM_COMPONENT_SPEC_RE = /^form:(?:([^:]+):)?(.+)$/;
+    const PACKAGE_QUALIFIED_FORM_NAME_RE = /^([^.]+)\.(.+)$/;
     const componentTypeSpec_PYTHON_KEYWORDS = new Set([
         "False",
         "None",
@@ -15932,32 +15933,17 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         "match",
         "case"
     ]);
-    const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form)";
+    const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form, form:APP_ID:Package.Form)";
     const COMPONENT_TYPE_REFERENCE_MESSAGE = "must be a known Anvil component type (see componentIcons.ts), a form: reference, or a package-qualified form reference (Package.Form)";
     function isValidIdentifierSegment(value) {
         return value.length > 0 && componentTypeSpec_IDENTIFIER_RE.test(value) && !componentTypeSpec_PYTHON_KEYWORDS.has(value);
     }
     function isValidLegacyFormTypeReference(typeName) {
-        if (!typeName.startsWith("form:")) return false;
-        const rest = typeName.slice(5);
-        if (0 === rest.length) return false;
-        let classPath = rest;
-        if (rest.startsWith("dep_")) {
-            const splitIndex = rest.indexOf(":");
-            if (splitIndex <= 0) return false;
-            const depId = rest.slice(0, splitIndex);
-            if (!DEP_ID_RE.test(depId)) return false;
-            classPath = rest.slice(splitIndex + 1);
-        }
-        if (0 === classPath.length) return false;
-        return classPath.split(".").every((part)=>isValidIdentifierSegment(part));
+        return LEGACY_CUSTOM_COMPONENT_SPEC_RE.test(typeName);
     }
     function isValidPackageQualifiedComponentType(typeName) {
         if (typeName.startsWith("anvil.")) return false;
-        if (!typeName.includes(".")) return false;
-        const parts = typeName.split(".");
-        if (parts.length < 2) return false;
-        return parts.every((part)=>isValidIdentifierSegment(part));
+        return PACKAGE_QUALIFIED_FORM_NAME_RE.test(typeName);
     }
     function componentTypeSpec_pushIssue(issues, path, message) {
         issues.push({
@@ -16066,7 +16052,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             const bindingPath = `${path}[${index}]`;
             if (!isPlainObject(binding)) return void formTemplateValidation_pushIssue(issues, bindingPath, "must be an object");
             if ("string" != typeof binding.property || 0 === binding.property.length) formTemplateValidation_pushIssue(issues, `${bindingPath}.property`, "must be a non-empty string");
-            if ("string" != typeof binding.code || 0 === binding.code.length) formTemplateValidation_pushIssue(issues, `${bindingPath}.code`, "must be a non-empty string");
+            if ("string" != typeof binding.code) formTemplateValidation_pushIssue(issues, `${bindingPath}.code`, "must be a string");
             if (void 0 !== binding.writeback && "boolean" != typeof binding.writeback) formTemplateValidation_pushIssue(issues, `${bindingPath}.writeback`, "must be a boolean");
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.8.0-canary.3",
+  "version": "0.8.0-canary.4",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/api.d.ts",