js-bao 0.4.2 → 0.5.0

package/dist/browser.cjs

@@ -3034,7 +3034,7 @@ var init_BaseModel = __esm({
       validateBeforeSave() {
         const schema = this.constructor.getSchema();
         for (const [fieldKey, fieldOptions] of schema.fields.entries()) {
-          const currentValue = this.getValue(fieldKey);
+          const currentValue = fieldKey === "id" ? this.id : this.getValue(fieldKey);
           if (fieldOptions.required && (currentValue === null || currentValue === void 0)) {
             throw new Error(`Field ${fieldKey} is required before save`);
           }

package/dist/browser.js

@@ -3012,7 +3012,7 @@ var init_BaseModel = __esm({
       validateBeforeSave() {
         const schema = this.constructor.getSchema();
         for (const [fieldKey, fieldOptions] of schema.fields.entries()) {
-          const currentValue = this.getValue(fieldKey);
+          const currentValue = fieldKey === "id" ? this.id : this.getValue(fieldKey);
           if (fieldOptions.required && (currentValue === null || currentValue === void 0)) {
             throw new Error(`Field ${fieldKey} is required before save`);
           }

package/dist/codegen-v2.cjs

@@ -533,7 +533,8 @@ function renderModelFile(input) {
   lines.push(`export interface ${className}Attrs {`);
   for (const [fieldName, opts] of Object.entries(fields)) {
     const tsType = tsTypeForFieldType(opts.type);
-    const optional = opts.required === true ? "" : "?";
+    const isRequired = opts.required === true || opts.autoAssign === true && fieldName === "id";
+    const optional = isRequired ? "" : "?";
     lines.push(`  ${fieldName}${optional}: ${tsType};`);
   }
   lines.push(`}`);
@@ -642,7 +643,9 @@ function renderBarrel(input) {
   lines.push(`  }`);
   lines.push(`}`);
   lines.push("");
-  lines.push(`export const allModels: unknown[] = _modelPairs.map((m) => m.class);`);
+  lines.push(
+    `export const allModels: Array<typeof BaseModel> = _modelPairs.map((m) => m.class);`
+  );
   lines.push("");
   return lines.join("\n");
 }
@@ -1062,10 +1065,18 @@ function parseDefineModelSchemaArg(obj, sf) {
     if (opts && opts.type === "id") {
       fd.severity = "info";
       opts.autoAssign = true;
+      if (fd.field === "id") {
+        opts.required = true;
+      }
     } else {
       fd.severity = "warn";
     }
   }
+  for (const [fieldName, opts] of Object.entries(fields)) {
+    if (fieldName === "id" && opts.autoAssign === true && opts.required !== false) {
+      opts.required = true;
+    }
+  }
   return { modelName, fields, relationships, uniqueConstraints, functionDefaults };
 }
 function parseFields(obj, sf) {
@@ -1477,7 +1488,7 @@ var Logger2 = class _Logger {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.4.2",
+  version: "0.5.0",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",

package/dist/codegen.cjs

@@ -1181,7 +1181,7 @@ var SchemaExtractor = class {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.4.2",
+  version: "0.5.0",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",

package/dist/index.cjs

@@ -2320,7 +2320,7 @@ var init_BaseModel = __esm({
       validateBeforeSave() {
         const schema = this.constructor.getSchema();
         for (const [fieldKey, fieldOptions] of schema.fields.entries()) {
-          const currentValue = this.getValue(fieldKey);
+          const currentValue = fieldKey === "id" ? this.id : this.getValue(fieldKey);
           if (fieldOptions.required && (currentValue === null || currentValue === void 0)) {
             throw new Error(`Field ${fieldKey} is required before save`);
           }

package/dist/index.js

@@ -2298,7 +2298,7 @@ var init_BaseModel = __esm({
       validateBeforeSave() {
         const schema = this.constructor.getSchema();
         for (const [fieldKey, fieldOptions] of schema.fields.entries()) {
-          const currentValue = this.getValue(fieldKey);
+          const currentValue = fieldKey === "id" ? this.id : this.getValue(fieldKey);
           if (fieldOptions.required && (currentValue === null || currentValue === void 0)) {
             throw new Error(`Field ${fieldKey} is required before save`);
           }

package/dist/node.cjs

@@ -3034,7 +3034,7 @@ var init_BaseModel = __esm({
       validateBeforeSave() {
         const schema = this.constructor.getSchema();
         for (const [fieldKey, fieldOptions] of schema.fields.entries()) {
-          const currentValue = this.getValue(fieldKey);
+          const currentValue = fieldKey === "id" ? this.id : this.getValue(fieldKey);
           if (fieldOptions.required && (currentValue === null || currentValue === void 0)) {
             throw new Error(`Field ${fieldKey} is required before save`);
           }

package/dist/node.js

@@ -3012,7 +3012,7 @@ var init_BaseModel = __esm({
       validateBeforeSave() {
         const schema = this.constructor.getSchema();
         for (const [fieldKey, fieldOptions] of schema.fields.entries()) {
-          const currentValue = this.getValue(fieldKey);
+          const currentValue = fieldKey === "id" ? this.id : this.getValue(fieldKey);
           if (fieldOptions.required && (currentValue === null || currentValue === void 0)) {
             throw new Error(`Field ${fieldKey} is required before save`);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-bao",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "A library providing data modeling capabilities which support live updates and queries.",
   "types": "dist/index.d.ts",
   "type": "module",