js-bao 0.3.1 → 0.4.0

package/dist/node.cjs

@@ -1634,11 +1634,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
@@ -1656,7 +1656,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)) {
@@ -1700,7 +1700,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;
       }
@@ -1711,13 +1711,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;
             }
@@ -1747,7 +1747,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();
@@ -1758,7 +1758,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;
         }
@@ -1789,7 +1789,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;
         }
@@ -1827,7 +1827,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;
         }
@@ -2591,7 +2591,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
@@ -3138,7 +3138,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;
@@ -5533,11 +5533,11 @@ var init_BaseModel = __esm({
 });
 
 // src/engines/SqljsEngine.ts
-var import_sql5, import_async_mutex, SQL_WASM_URL, TransactionalSQLJSOperations, SqljsEngine;
+var import_sql4, import_async_mutex, SQL_WASM_URL, TransactionalSQLJSOperations, SqljsEngine;
 var init_SqljsEngine = __esm({
   "src/engines/SqljsEngine.ts"() {
     "use strict";
-    import_sql5 = __toESM(require("sql.js"), 1);
+    import_sql4 = __toESM(require("sql.js"), 1);
     init_BaseModel();
     import_async_mutex = require("async-mutex");
     init_sql();
@@ -5614,7 +5614,7 @@ var init_SqljsEngine = __esm({
               "[SqljsEngine] Attempting to load SQL.js WASM from:",
               locateFileConfig("sql-wasm.wasm")
             );
-            _SqljsEngine.SQL = await (0, import_sql5.default)({
+            _SqljsEngine.SQL = await (0, import_sql4.default)({
               locateFile: locateFileConfig
             });
             Logger.info("[SqljsEngine] SQL.js WASM loaded successfully.");
@@ -6661,10 +6661,8 @@ __export(node_exports, {
   BaseModel: () => BaseModel2,
   DatabaseEngine: () => DatabaseEngine,
   DatabaseFactory: () => NodeDatabaseFactory,
-  Field: () => Field,
   LogLevel: () => LogLevel,
   Logger: () => Logger,
-  Model: () => Model,
   ModelRegistry: () => ModelRegistry,
   RecordNotFoundError: () => RecordNotFoundError,
   SqljsEngine: () => SqljsEngine,
@@ -6702,131 +6700,6 @@ module.exports = __toCommonJS(node_exports);
 init_BaseModel();
 init_ModelRegistry();
 
-// 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/engines/DatabaseEngine.ts
 var DatabaseEngine = class {
   createTable(_modelName, _schema, _options) {
@@ -7627,10 +7500,8 @@ async function getRecommendedNodeEngine() {
   BaseModel,
   DatabaseEngine,
   DatabaseFactory,
-  Field,
   LogLevel,
   Logger,
-  Model,
   ModelRegistry,
   RecordNotFoundError,
   SqljsEngine,

package/dist/node.d.cts

@@ -663,9 +663,6 @@ declare class ModelRegistry {
     private validateSessionModels;
 }
 
-declare function Field(options: FieldOptions): (target: any, propertyKey: string | symbol) => void;
-declare function Model(options: ModelOptions): (targetClass: Function) => void;
-
 type NodeSqliteEngineOptions$1 = {
     filePath?: string;
     options?: {
@@ -769,7 +766,7 @@ interface InitJsBaoOptions {
     /**
      * Optional array of model classes to initialize.
      * If not provided, the ORM will rely on models being registered
-     * via the @Model decorator (assuming they have been imported by the application).
+     * via attachAndRegisterModel (assuming they have been imported by the application).
      */
     models?: (typeof BaseModel)[];
 }
@@ -1077,4 +1074,4 @@ declare function summarizePlainYDoc(dump: PlainYDoc): DumpSummary;
 
 declare function getRecommendedNodeEngine(): Promise<string>;
 
-export { type AddRelationMethod, type AggregationAliasDebugInfo, type AggregationOperation, type AggregationOptions, type AggregationResult, BaseModel, type DatabaseConfig, DatabaseEngine, type DatabaseEngineOptions, type DatabaseEngineType, NodeDatabaseFactory as DatabaseFactory, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DumpOptions, type DumpSummary, type DumpSummaryEntry, Field, type FieldOptions, type FieldType, type GroupByField, type HasManyMethod, type HasManyThroughMethod, type InferAttrs, type InitJsBaoOptions, type InitJsBaoResult, LogLevel, Logger, Model, type ModelConstructor, type ModelOptions, ModelRegistry, type NodeSqliteEngineOptions, type PaginatedResult, type PaginationOptions, type PlainYDoc, RecordNotFoundError, type RefersToMethod, type RegisteredModelInfo, type RemoveRelationMethod, type SQLJSEngineOptions, type Schema, SqljsEngine, type SqljsEngineOptions, StringSet, type StringSetMembership, type UniqueConstraintConfig, UniqueConstraintViolationError, attachAndRegisterModel, attachSchemaToClass, autoRegisterModel, clearMetaSyncCache, constants, createModelClass, defineModelSchema, detectEnvironment, discoverModelNames, discoverSchema, dumpYDocToPlain, features, generateULID, getRecommendedNodeEngine, inferFieldType, initJsBao, isBrowser, isNode, isNodeModuleAvailable, loadSchemaFromToml, loadSchemaFromTomlString, registerFunctionDefault, resetJsBao, schemaToToml, summarizePlainYDoc, syncInferredMeta, syncModelMeta };
+export { type AddRelationMethod, type AggregationAliasDebugInfo, type AggregationOperation, type AggregationOptions, type AggregationResult, BaseModel, type DatabaseConfig, DatabaseEngine, type DatabaseEngineOptions, type DatabaseEngineType, NodeDatabaseFactory as DatabaseFactory, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DumpOptions, type DumpSummary, type DumpSummaryEntry, type FieldOptions, type FieldType, type GroupByField, type HasManyMethod, type HasManyThroughMethod, type InferAttrs, type InitJsBaoOptions, type InitJsBaoResult, LogLevel, Logger, type ModelConstructor, type ModelOptions, ModelRegistry, type NodeSqliteEngineOptions, type PaginatedResult, type PaginationOptions, type PlainYDoc, RecordNotFoundError, type RefersToMethod, type RegisteredModelInfo, type RemoveRelationMethod, type SQLJSEngineOptions, type Schema, SqljsEngine, type SqljsEngineOptions, StringSet, type StringSetMembership, type UniqueConstraintConfig, UniqueConstraintViolationError, attachAndRegisterModel, attachSchemaToClass, autoRegisterModel, clearMetaSyncCache, constants, createModelClass, defineModelSchema, detectEnvironment, discoverModelNames, discoverSchema, dumpYDocToPlain, features, generateULID, getRecommendedNodeEngine, inferFieldType, initJsBao, isBrowser, isNode, isNodeModuleAvailable, loadSchemaFromToml, loadSchemaFromTomlString, registerFunctionDefault, resetJsBao, schemaToToml, summarizePlainYDoc, syncInferredMeta, syncModelMeta };

package/dist/node.d.ts

@@ -663,9 +663,6 @@ declare class ModelRegistry {
     private validateSessionModels;
 }
 
-declare function Field(options: FieldOptions): (target: any, propertyKey: string | symbol) => void;
-declare function Model(options: ModelOptions): (targetClass: Function) => void;
-
 type NodeSqliteEngineOptions$1 = {
     filePath?: string;
     options?: {
@@ -769,7 +766,7 @@ interface InitJsBaoOptions {
     /**
      * Optional array of model classes to initialize.
      * If not provided, the ORM will rely on models being registered
-     * via the @Model decorator (assuming they have been imported by the application).
+     * via attachAndRegisterModel (assuming they have been imported by the application).
      */
     models?: (typeof BaseModel)[];
 }
@@ -1077,4 +1074,4 @@ declare function summarizePlainYDoc(dump: PlainYDoc): DumpSummary;
 
 declare function getRecommendedNodeEngine(): Promise<string>;
 
-export { type AddRelationMethod, type AggregationAliasDebugInfo, type AggregationOperation, type AggregationOptions, type AggregationResult, BaseModel, type DatabaseConfig, DatabaseEngine, type DatabaseEngineOptions, type DatabaseEngineType, NodeDatabaseFactory as DatabaseFactory, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DumpOptions, type DumpSummary, type DumpSummaryEntry, Field, type FieldOptions, type FieldType, type GroupByField, type HasManyMethod, type HasManyThroughMethod, type InferAttrs, type InitJsBaoOptions, type InitJsBaoResult, LogLevel, Logger, Model, type ModelConstructor, type ModelOptions, ModelRegistry, type NodeSqliteEngineOptions, type PaginatedResult, type PaginationOptions, type PlainYDoc, RecordNotFoundError, type RefersToMethod, type RegisteredModelInfo, type RemoveRelationMethod, type SQLJSEngineOptions, type Schema, SqljsEngine, type SqljsEngineOptions, StringSet, type StringSetMembership, type UniqueConstraintConfig, UniqueConstraintViolationError, attachAndRegisterModel, attachSchemaToClass, autoRegisterModel, clearMetaSyncCache, constants, createModelClass, defineModelSchema, detectEnvironment, discoverModelNames, discoverSchema, dumpYDocToPlain, features, generateULID, getRecommendedNodeEngine, inferFieldType, initJsBao, isBrowser, isNode, isNodeModuleAvailable, loadSchemaFromToml, loadSchemaFromTomlString, registerFunctionDefault, resetJsBao, schemaToToml, summarizePlainYDoc, syncInferredMeta, syncModelMeta };
+export { type AddRelationMethod, type AggregationAliasDebugInfo, type AggregationOperation, type AggregationOptions, type AggregationResult, BaseModel, type DatabaseConfig, DatabaseEngine, type DatabaseEngineOptions, type DatabaseEngineType, NodeDatabaseFactory as DatabaseFactory, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DumpOptions, type DumpSummary, type DumpSummaryEntry, type FieldOptions, type FieldType, type GroupByField, type HasManyMethod, type HasManyThroughMethod, type InferAttrs, type InitJsBaoOptions, type InitJsBaoResult, LogLevel, Logger, type ModelConstructor, type ModelOptions, ModelRegistry, type NodeSqliteEngineOptions, type PaginatedResult, type PaginationOptions, type PlainYDoc, RecordNotFoundError, type RefersToMethod, type RegisteredModelInfo, type RemoveRelationMethod, type SQLJSEngineOptions, type Schema, SqljsEngine, type SqljsEngineOptions, StringSet, type StringSetMembership, type UniqueConstraintConfig, UniqueConstraintViolationError, attachAndRegisterModel, attachSchemaToClass, autoRegisterModel, clearMetaSyncCache, constants, createModelClass, defineModelSchema, detectEnvironment, discoverModelNames, discoverSchema, dumpYDocToPlain, features, generateULID, getRecommendedNodeEngine, inferFieldType, initJsBao, isBrowser, isNode, isNodeModuleAvailable, loadSchemaFromToml, loadSchemaFromTomlString, registerFunctionDefault, resetJsBao, schemaToToml, summarizePlainYDoc, syncInferredMeta, syncModelMeta };

package/dist/node.js

@@ -1612,11 +1612,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
@@ -1634,7 +1634,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)) {
@@ -1678,7 +1678,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;
       }
@@ -1689,13 +1689,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;
             }
@@ -1725,7 +1725,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();
@@ -1736,7 +1736,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;
         }
@@ -1767,7 +1767,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;
         }
@@ -1805,7 +1805,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;
         }
@@ -2569,7 +2569,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
@@ -3116,7 +3116,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;
@@ -6637,131 +6637,6 @@ var init_BrowserDatabaseFactory = __esm({
 init_BaseModel();
 init_ModelRegistry();
 
-// 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/engines/DatabaseEngine.ts
 var DatabaseEngine = class {
   createTable(_modelName, _schema, _options) {
@@ -7561,10 +7436,8 @@ export {
   BaseModel2 as BaseModel,
   DatabaseEngine,
   NodeDatabaseFactory as DatabaseFactory,
-  Field,
   LogLevel,
   Logger,
-  Model,
   ModelRegistry,
   RecordNotFoundError,
   SqljsEngine,

package/package.json

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