@farm.js/sync 0.1.0-beta.5 → 0.1.0-beta.6

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAsB,MAAM,aAAa,CAAC;AAC3F,OAAO,EACL,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EAErB,KAAK,SAAS,EACf,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,wEAAwE;IACxE,MAAM,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,+DAA+D;IAC/D,KAAK,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IAC1B,mFAAmF;IACnF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACzC,kEAAkE;IAClE,UAAU,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACvC,kCAAkC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAC3B,GAAG,EAAE,qBAAqB,KACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AAE9E,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,YAAY,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,SAAS,EACT,gBAAgB,GACjB,MAAM,YAAY,CAAC;AAIpB,wBAAgB,IAAI,CAAC,OAAO,EAAE,iBAAiB;;;;;;;;;;;yDAgJ9C;AAqMD,mCAAmC;AACnC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,CAAC;AACvE,YAAY,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAsB,MAAM,aAAa,CAAC;AAC3F,OAAO,EACL,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EAErB,KAAK,SAAS,EACf,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,wEAAwE;IACxE,MAAM,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,+DAA+D;IAC/D,KAAK,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IAC1B,mFAAmF;IACnF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACzC,kEAAkE;IAClE,UAAU,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACvC,kCAAkC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAC3B,GAAG,EAAE,qBAAqB,KACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AAE9E,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,YAAY,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,SAAS,EACT,gBAAgB,GACjB,MAAM,YAAY,CAAC;AAIpB,wBAAgB,IAAI,CAAC,OAAO,EAAE,iBAAiB;;;;;;;;;;;yDAmI9C;AAsOD,mCAAmC;AACnC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,CAAC;AACvE,YAAY,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { declareSchemaTables, definePlugin, describeIntegrationOriginRejection, resolveIntegrationAllowedOrigins, validateIntegrationRequestOrigin, } from "@farm.js/core";
+import { definePlugin, describeIntegrationOriginRejection, resolveIntegrationAllowedOrigins, validateIntegrationRequestOrigin, } from "@farm.js/core";
 import { executeSyncOperation, SyncOperationError } from "./server.js";
 import { resolveSyncModels, } from "./types.js";
 const DEFAULT_PATH = "/_farm/sync";
@@ -18,8 +18,17 @@ export function sync(options) {
         ormPromise ??= resolveSyncClient(options, models);
         return ormPromise;
     };
-    const plugin = definePlugin({
+    return definePlugin({
         name: "farm:sync",
+        // `farm sync migrate` creates the tables of the models the app exposed.
+        // The rest of the app's schema is described, not created: those tables
+        // are the app's.
+        schema: syncOwnedSchema(options.schema, models),
+        // The database the app gave sync, not storage.client.
+        database: {
+            client: () => resolveSyncConnection(options),
+            dialect: options.dialect,
+        },
         client: {
             // Serializable descriptor the browser runtime reads at startup.
             public: {
@@ -96,27 +105,6 @@ export function sync(options) {
                 await sendNodeResponse(res, response);
         },
     });
-    // Declare the tables sync owns, so `farm sync migrate` can create them
-    // without re-reading or re-validating configuration.
-    return declareSchemaTables(plugin, {
-        name: "sync",
-        schema: options.schema,
-        // A model the app has not opened to the browser is not sync's to create.
-        models: Array.from(models.keys()),
-        dialect: options.dialect,
-        resolveClient: async () => {
-            if (options.client) {
-                return typeof options.client === "function"
-                    ? await options.client()
-                    : options.client;
-            }
-            if (options.storage) {
-                const { getStorage } = await import("@farm.js/core/storage");
-                return getStorage(options.storage);
-            }
-            return undefined;
-        },
-    });
 }
 async function handleSyncRequest(request, bodyOverride, options) {
     const pathname = new URL(request.url).pathname;
@@ -210,28 +198,59 @@ async function runMiddleware(middleware, request) {
     }
     return context;
 }
-async function resolveSyncClient(options, models) {
+/**
+ * The app's schema as sync owns it: exposed models are sync's tables, the rest
+ * are described but never created. `extend` is folded into the models first,
+ * so the app composing its own schema is never read as sync asking to add
+ * columns to the app's tables.
+ */
+function syncOwnedSchema(schema, exposed) {
+    const models = { ...schema.models };
+    for (const [key, extension] of Object.entries(schema.extend ?? {})) {
+        const existing = models[key];
+        models[key] = {
+            ...(existing ?? { fields: {} }),
+            ...(extension.name ? { name: extension.name } : {}),
+            ...(extension.description ? { description: extension.description } : {}),
+            fields: { ...existing?.fields, ...extension.fields },
+            constraints: [...(existing?.constraints ?? []), ...(extension.constraints ?? [])],
+            meta: { ...existing?.meta, ...extension.meta },
+        };
+    }
+    return {
+        ...schema,
+        extend: undefined,
+        models: Object.fromEntries(Object.entries(models).map(([key, model]) => [
+            key,
+            { ...model, external: !exposed.has(key) },
+        ])),
+    };
+}
+/** The connection or storage mount the app gave sync. */
+async function resolveSyncConnection(options) {
     if (options.client) {
-        const provided = typeof options.client === "function"
+        return typeof options.client === "function"
             ? await options.client()
             : options.client;
-        // Already model-shaped: an @farming-labs/orm client, or anything exposing
-        // the same four methods. Use it directly.
-        if (isModelClient(provided, models))
-            return provided;
-        return buildOrm(options.schema, provided);
     }
     if (options.storage) {
-        const mount = options.storage;
         // Imported lazily so the storage runtime never reaches a browser bundle.
         const { getStorage } = await import("@farm.js/core/storage");
         // A mount is an unstorage instance, which the orm runtime drives like any
         // other backend — so this is the same code path as a real database.
-        return buildOrm(options.schema, getStorage(mount));
+        return getStorage(options.storage);
     }
     throw new Error("sync(): no data source is configured. Set `storage` to a mount name from " +
         "storage.mounts in farm.config.ts, or pass `client` with your database connection.");
 }
+async function resolveSyncClient(options, models) {
+    const provided = await resolveSyncConnection(options);
+    // Already model-shaped: an @farming-labs/orm client, or anything exposing
+    // the same four methods. Use it directly.
+    if (options.client && isModelClient(provided, models))
+        return provided;
+    return buildOrm(options.schema, provided);
+}
 /** Let the orm runtime detect the driver and build the model client. */
 async function buildOrm(schema, client) {
     const { createIntegrationOrm } = await import("@farm.js/core");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/sync",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.6",
   "description": "Local-first collections for Farm.js: schema-driven reads, optimistic writes, offline queueing",
   "keywords": [
     "farm.js",
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@farm.js/core": "0.1.0"
+    "@farm.js/core": "0.1.1"
   },
   "devDependencies": {
     "@farming-labs/orm": "0.0.62",