js-bao 0.3.0 → 0.4.0

package/dist/index.js

@@ -1855,7 +1855,7 @@ var init_BaseModel = __esm({
       getDocumentId() {
         return this._metaDocId;
       }
-      // id is now a plain property. Subclasses will define it with @Field.
+      // id is a plain property. Subclasses define it via defineModelSchema.
       id;
       type;
       // This should be the modelName from ModelOptions
@@ -2402,7 +2402,7 @@ var init_BaseModel = __esm({
         const verboseEnabled = Logger.getLogLevel() >= 5 /* VERBOSE */;
         if (!schema || !schema.options || !schema.options.name || !schema.resolvedUniqueConstraints) {
           throw new Error(
-            `[${this.name}] Model schema is not registered, missing options, or missing resolvedUniqueConstraints. Did you forget to use the @Model decorator or has the schema structure changed?`
+            `[${this.name}] Model schema is not registered, missing options, or missing resolvedUniqueConstraints. Did you forget to call attachAndRegisterModel (or autoRegisterModel) for this model?`
           );
         }
         const modelName = schema.options.name;
@@ -5110,11 +5110,11 @@ var init_ModelRegistry = __esm({
     init_relationshipManager();
     ModelRegistry = class _ModelRegistry {
       static instance;
-      // Stores globally registered model classes by their name (from @Model decorator)
+      // Stores globally registered model classes by their name
       models = /* @__PURE__ */ new Map();
-      // Stores options for globally registered models (from @Model decorator)
+      // Stores options for globally registered models
       modelOptions = /* @__PURE__ */ new Map();
-      // Stores fields for globally registered models (from @Model decorator, or a static getter on class)
+      // Stores fields for globally registered models (or a static getter on class)
       // For simplicity, let's assume fields can be derived or are less critical for this registry part
       // private modelFields: Map<string, Map<string, FieldOptions>> = new Map();
       // Holds the subset of models explicitly set for the current initialization session
@@ -5132,7 +5132,7 @@ var init_ModelRegistry = __esm({
       registerModel(modelClass, options, fields) {
         if (!options.name) {
           throw new Error(
-            `[ModelRegistry] Model class is missing a name in its @Model options. Ensure the @Model decorator includes a 'name' property.`
+            `[ModelRegistry] Model class is missing a name in its options. Ensure the schema passed to defineModelSchema/createModelClass/attachAndRegisterModel includes a 'name' property.`
           );
         }
         if (this.models.has(options.name)) {
@@ -5176,7 +5176,7 @@ var init_ModelRegistry = __esm({
         }
         return infos;
       }
-      // Helper to get model name from class (assuming static property from @Model decorator)
+      // Helper to get model name from class (set by attachAndRegisterModel/createModelClass)
       getModelNameFromClass(modelClass) {
         return modelClass.modelName;
       }
@@ -5187,13 +5187,13 @@ var init_ModelRegistry = __esm({
             const modelName = this.getModelNameFromClass(modelClass);
             if (!modelName) {
               console.warn(
-                `[ModelRegistry] A model class provided to setExplicitModelsForSession does not have a static 'modelName' property or it's undefined. It will be ignored. Ensure @Model decorator sets this.`
+                `[ModelRegistry] A model class provided to setExplicitModelsForSession does not have a static 'modelName' property or it's undefined. It will be ignored. Ensure attachAndRegisterModel (or createModelClass) was called for this model.`
               );
               return;
             }
             if (!this.models.has(modelName) || this.models.get(modelName) !== modelClass) {
               console.warn(
-                `[ModelRegistry] Model class with name ${modelName} provided to setExplicitModelsForSession was not found in the global decorator-based registry or does not match. It will be ignored. Ensure the model file is imported and the @Model decorator has run correctly.`
+                `[ModelRegistry] Model class with name ${modelName} provided to setExplicitModelsForSession was not found in the global registry or does not match. It will be ignored. Ensure the model file is imported and attachAndRegisterModel (or createModelClass) has run.`
               );
               return;
             }
@@ -5223,7 +5223,7 @@ var init_ModelRegistry = __esm({
         } else {
           this.activeSessionModels = null;
           console.log(
-            "[ModelRegistry] No explicit models specified for session (undefined), will use all decorator-registered models."
+            "[ModelRegistry] No explicit models specified for session (undefined), will use all globally registered models."
           );
         }
         this.validateSessionModels();
@@ -5234,7 +5234,7 @@ var init_ModelRegistry = __esm({
         const modelsToInitialize = this.activeSessionModels || this.models;
         if (modelsToInitialize.size === 0) {
           console.warn(
-            "[ModelRegistry] No models to initialize (either no explicit models set for session or no models globally registered via @Model decorator)."
+            "[ModelRegistry] No models to initialize (either no explicit models set for session or no models globally registered via attachAndRegisterModel)."
           );
           return;
         }
@@ -5265,7 +5265,7 @@ var init_ModelRegistry = __esm({
         const modelsToInitialize = this.activeSessionModels || this.models;
         if (modelsToInitialize.size === 0) {
           Logger.warn(
-            "[ModelRegistry] No models to initialize for document (either no explicit models set for session or no models globally registered via @Model decorator)."
+            "[ModelRegistry] No models to initialize for document (either no explicit models set for session or no models globally registered via attachAndRegisterModel)."
           );
           return;
         }
@@ -5303,7 +5303,7 @@ var init_ModelRegistry = __esm({
         const modelsToCleanup = this.activeSessionModels || this.models;
         if (modelsToCleanup.size === 0) {
           console.warn(
-            "[ModelRegistry] No models to cleanup for document (either no explicit models set for session or no models globally registered via @Model decorator)."
+            "[ModelRegistry] No models to cleanup for document (either no explicit models set for session or no models globally registered via attachAndRegisterModel)."
           );
           return;
         }
@@ -6834,133 +6834,6 @@ async function resetJsBao() {
 // src/index.ts
 init_documentTypes();
 init_BaseModel();
-
-// src/models/decorators.ts
-init_ModelRegistry();
-init_BaseModel();
-init_sql();
-var SCHEMA_FIELDS_PROPERTY = "_jsbaoSchemaFields";
-function Field(options) {
-  return function(target, propertyKey) {
-    const fieldName = String(propertyKey);
-    const modelConstructor = target.constructor || target;
-    assertValidIdentifier(
-      fieldName,
-      `[Field Decorator] Invalid field name on ${modelConstructor?.name || "unknown"}`
-    );
-    if (!modelConstructor) {
-      console.error(
-        "[Field Decorator] Could not determine model constructor for field:",
-        fieldName,
-        "Target:",
-        target
-      );
-      throw new Error(
-        `Failed to resolve model constructor for field '${fieldName}'.`
-      );
-    }
-    if (!Object.prototype.hasOwnProperty.call(
-      modelConstructor,
-      SCHEMA_FIELDS_PROPERTY
-    )) {
-      modelConstructor[SCHEMA_FIELDS_PROPERTY] = /* @__PURE__ */ new Map();
-    }
-    modelConstructor[SCHEMA_FIELDS_PROPERTY].set(
-      fieldName,
-      options
-    );
-    Logger.debug(
-      `[Field Decorator] Staged field "${fieldName}" for class ${modelConstructor.name}:`,
-      options
-    );
-  };
-}
-function Model(options) {
-  return function(targetClass) {
-    Logger.debug(
-      `[Model Decorator] Registering model:`,
-      targetClass.name,
-      options
-    );
-    assertValidIdentifier(
-      options.name,
-      `[Model Decorator] Invalid model name for ${targetClass.name}`
-    );
-    const registry = ModelRegistry.getInstance();
-    targetClass.modelName = options.name;
-    targetClass.getSchema = () => {
-      const combinedFields = /* @__PURE__ */ new Map();
-      const hierarchyStack = [];
-      let currentEvalClass = targetClass;
-      while (currentEvalClass && currentEvalClass.prototype) {
-        hierarchyStack.push(currentEvalClass);
-        const parentPrototype = Object.getPrototypeOf(
-          currentEvalClass.prototype
-        );
-        currentEvalClass = parentPrototype ? parentPrototype.constructor : null;
-        if (currentEvalClass === Object) break;
-      }
-      for (let i = hierarchyStack.length - 1; i >= 0; i--) {
-        const cls = hierarchyStack[i];
-        if (Object.prototype.hasOwnProperty.call(cls, SCHEMA_FIELDS_PROPERTY)) {
-          const fieldsForClass = cls[SCHEMA_FIELDS_PROPERTY];
-          fieldsForClass.forEach((fieldOpts, fieldName) => {
-            combinedFields.set(fieldName, fieldOpts);
-          });
-        }
-      }
-      const resolvedUniqueConstraints = [];
-      combinedFields.forEach((fieldOpts, fieldName) => {
-        if (fieldOpts.unique) {
-          const constraintName = `${options.name}_${fieldName}_unique`;
-          resolvedUniqueConstraints.push({
-            name: constraintName,
-            fields: [fieldName]
-          });
-        }
-      });
-      if (options.uniqueConstraints) {
-        options.uniqueConstraints.forEach(
-          (constraintConfig) => {
-            const allFieldsExist = constraintConfig.fields.every(
-              (f) => combinedFields.has(f)
-            );
-            if (!allFieldsExist) {
-              console.warn(
-                `[Model Decorator] Unique constraint "${constraintConfig.name}" for model "${options.name}" specifies non-existent fields. Skipping.`
-              );
-              return;
-            }
-            if (resolvedUniqueConstraints.some(
-              (rc) => rc.name === constraintConfig.name
-            )) {
-              console.warn(
-                `[Model Decorator] Duplicate unique constraint name "${constraintConfig.name}" in model "${options.name}".`
-              );
-            }
-            resolvedUniqueConstraints.push({
-              name: constraintConfig.name,
-              fields: constraintConfig.fields
-            });
-          }
-        );
-      }
-      return {
-        class: targetClass,
-        options,
-        fields: combinedFields,
-        resolvedUniqueConstraints
-      };
-    };
-    const directFieldsForThisClass = Object.prototype.hasOwnProperty.call(
-      targetClass,
-      SCHEMA_FIELDS_PROPERTY
-    ) ? targetClass[SCHEMA_FIELDS_PROPERTY] : /* @__PURE__ */ new Map();
-    registry.registerModel(targetClass, options, directFieldsForThisClass);
-  };
-}
-
-// src/index.ts
 init_StringSet();
 
 // src/models/schema.ts
@@ -7278,32 +7151,41 @@ import * as Y3 from "yjs";
 function discoverSchema(yDoc) {
   const models = {};
   const metaNames = /* @__PURE__ */ new Set();
-  for (const [key, type] of yDoc.share.entries()) {
+  for (const key of yDoc.share.keys()) {
     if (!key.startsWith("_meta_")) continue;
-    if (!(type instanceof Y3.Map)) continue;
+    const map = materializeMap(yDoc, key);
+    if (!map) continue;
     const modelName = key.slice("_meta_".length);
     metaNames.add(modelName);
-    models[modelName] = readModelMeta(type);
+    models[modelName] = readModelMeta(map);
   }
-  for (const [key, type] of yDoc.share.entries()) {
+  for (const key of yDoc.share.keys()) {
     if (key.startsWith("_")) continue;
-    if (!(type instanceof Y3.Map)) continue;
     if (metaNames.has(key)) continue;
-    const dataMap = type;
-    if (dataMap.size === 0) continue;
-    const inferred = inferModelFromData(dataMap);
+    const map = materializeMap(yDoc, key);
+    if (!map || map.size === 0) continue;
+    const inferred = inferModelFromData(map);
     if (inferred) models[key] = inferred;
   }
   return { models };
 }
 function discoverModelNames(yDoc) {
   const names = [];
-  for (const [key, type] of yDoc.share.entries()) {
+  for (const key of yDoc.share.keys()) {
     if (key.startsWith("_")) continue;
-    if (type instanceof Y3.Map) names.push(key);
+    const map = materializeMap(yDoc, key);
+    if (map) names.push(key);
   }
   return names.sort();
 }
+function materializeMap(yDoc, key) {
+  try {
+    const map = yDoc.getMap(key);
+    return map instanceof Y3.Map ? map : null;
+  } catch {
+    return null;
+  }
+}
 function readModelMeta(metaMap) {
   const fields = {};
   let constraints;
@@ -7523,10 +7405,8 @@ export {
   DatabaseEngine,
   DocumentClosedError,
   DocumentResolutionError,
-  Field,
   LogLevel,
   Logger,
-  Model,
   ModelRegistry,
   RecordNotFoundError,
   StringSet,