over-zero 0.0.10 → 0.0.11

package/dist/cjs/createZeroClient.native.js

@@ -1,103 +1,165 @@
 "use strict";
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: !0 });
-}, __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function")
-    for (let key of __getOwnPropNames(from))
-      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+    for (var name in all) __defProp(target, name, {
+      get: all[name],
+      enumerable: !0
+    });
+  },
+  __copyProps = (to, from, except, desc) => {
+    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+    return to;
+  };
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: !0
+}), mod);
 var createZeroClient_exports = {};
 __export(createZeroClient_exports, {
   createZeroClient: () => createZeroClient
 });
 module.exports = __toCommonJS(createZeroClient_exports);
-var import_jsx_runtime = require("react/jsx-runtime"), import_react = require("@rocicorp/zero/react"), import_helpers = require("@vxrn/helpers"), import_react2 = require("react"), import_createPermissions = require("./createPermissions"), import_context = require("./helpers/context"), import_createMutators = require("./helpers/createMutators"), import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery"), import_useZeroDebug = require("./helpers/useZeroDebug");
+var import_jsx_runtime = require("react/jsx-runtime"),
+  import_zero = require("@rocicorp/zero"),
+  import_react = require("@rocicorp/zero/react"),
+  import_helpers = require("@vxrn/helpers"),
+  import_react2 = require("react"),
+  import_createPermissions = require("./createPermissions.native.js"),
+  import_createMutators = require("./helpers/createMutators.native.js"),
+  import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery.native.js"),
+  import_useZeroDebug = require("./helpers/useZeroDebug.native.js"),
+  import_state = require("./state.native.js");
+function _type_of(obj) {
+  "@swc/helpers - typeof";
+
+  return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function createZeroClient(param) {
-  var { schema, models, disable } = param, modelPermissions = (0, import_helpers.mapObject)(models, function(val) {
-    return val.permissions;
-  }), latestZeroInstance = null, zero = new Proxy({}, {
-    get(_, key) {
-      return Reflect.get(latestZeroInstance, key, latestZeroInstance);
-    }
-  }), permissionsHelpers = (0, import_createPermissions.createPermissions)({
+  var {
     schema,
     models,
-    getContext: import_context.context,
-    environment: "client"
-  }), zeroEvents = (0, import_helpers.createEmitter)("zero", null), AuthDataContext = /* @__PURE__ */ (0, import_react2.createContext)({}), useAuthData = function() {
-    return (0, import_react2.use)(AuthDataContext);
-  };
-  function usePermission(table, action, objOrId) {
-    var enabled = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : typeof objOrId < "u", debug = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !1, keyBase = `${String(table)}${action}`, key = `${keyBase}${typeof objOrId == "string" ? objOrId : JSON.stringify(objOrId)}`, authData = useAuthData(), permission = modelPermissions[table], query = (function() {
-      var baseQuery = zero.query[table].one();
-      return !enabled || !permission ? baseQuery : baseQuery.where(function(eb) {
-        return permissionsHelpers.buildPermissionQuery(authData, eb, permission, action, objOrId);
+    disable
+  } = param;
+  (0, import_state.setSchema)(schema);
+  var modelWritePermissions = (0, import_helpers.mapObject)(models, function (val) {
+      return val.permissions;
+    }),
+    latestZeroInstance = null,
+    zero = new Proxy({}, {
+      get(_, key) {
+        return Reflect.get(latestZeroInstance, key, latestZeroInstance);
+      }
+    }),
+    permissionsHelpers = (0, import_createPermissions.createPermissions)({
+      schema,
+      environment: "client"
+    }),
+    zeroEvents = (0, import_helpers.createEmitter)("zero", null),
+    AuthDataContext = /* @__PURE__ */(0, import_react2.createContext)({}),
+    useAuthData = function () {
+      return (0, import_react2.use)(AuthDataContext);
+    };
+  function usePermission(table, objOrId) {
+    var enabled = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : typeof objOrId < "u",
+      debug = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1,
+      authData = useAuthData(),
+      permission = modelWritePermissions[table],
+      query = function () {
+        var baseQuery = zero.query[table].one();
+        return !enabled || !permission ? baseQuery : baseQuery.where(function (eb) {
+          return permissionsHelpers.buildPermissionQuery(authData, eb, permission, objOrId);
+        });
+      }(),
+      [data, status] = useQuery(query, {
+        enabled: !!(enabled && permission && authData && objOrId)
       });
-    })(), [data, status] = useQuery(query, {
-      enabled: !!(enabled && permission && authData && objOrId)
-    });
     debug && console.info("usePermission()", {
       data,
       status,
-      action,
       authData,
       permission
     }, (0, import_prettyFormatZeroQuery.prettyFormatZeroQuery)(query));
-    var result = data, allowed = !!result;
+    var result = data,
+      allowed = !!result;
     return objOrId ? allowed : !1;
   }
-  var useQuery = function(query, options) {
-    if (disable)
-      return [
-        null,
-        {
-          type: "unknown"
-        }
-      ];
-    var out = (0, import_react.useQuery)(query, options);
-    return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(query, options, out), out;
-  }, ProvideZero = function(param2) {
-    var { children, authData, ...props } = param2, mutators = (0, import_react2.useMemo)(function() {
-      return (0, import_createMutators.createMutators)({
-        models,
-        environment: "client",
-        authData,
-        can: permissionsHelpers.can
-      });
-    }, [
-      models,
-      authData
-    ]);
-    return disable ? children : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AuthDataContext.Provider, {
-      value: authData,
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.ZeroProvider, {
-        schema,
-        kvStore: "mem",
-        onError: function(error) {
-          console.error("Zero Error:", error), zeroEvents.emit({
-            type: "error",
-            message: error
+  var queryCache = /* @__PURE__ */new Map(),
+    parseAny = function (x) {
+      return [x[0]];
+    };
+  function useQuery() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) args[_key] = arguments[_key];
+    var [queryOrFn, paramsOrOptions, optionsArg] = args,
+      isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn),
+      {
+        actualQuery,
+        options
+      } = (0, import_react2.useMemo)(function () {
+        if (!isPlainFunction) return {
+          actualQuery: queryOrFn,
+          options: paramsOrOptions
+        };
+        var fn = queryOrFn,
+          queryName = fn.name || "anonymousQuery",
+          hasParams = optionsArg !== void 0 || paramsOrOptions && (typeof paramsOrOptions > "u" ? "undefined" : _type_of(paramsOrOptions)) === "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions),
+          params = hasParams ? paramsOrOptions : void 0,
+          opts = hasParams ? optionsArg : paramsOrOptions,
+          synced = queryCache.get(queryName);
+        synced || (synced = (0, import_zero.syncedQuery)(queryName, parseAny, function (arg) {
+          return fn(arg);
+        }), queryCache.set(queryName, synced));
+        var query = params !== void 0 ? synced(params) : synced;
+        return {
+          actualQuery: query,
+          options: opts
+        };
+      }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]),
+      out = (0, import_react.useQuery)(actualQuery, options);
+    return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(actualQuery, options, out), disable ? [null, {
+      type: "unknown"
+    }] : out;
+  }
+  var ProvideZero = function (param2) {
+      var {
+          children,
+          authData,
+          ...props
+        } = param2,
+        mutators = (0, import_react2.useMemo)(function () {
+          return (0, import_state.setAuthData)(authData), (0, import_createMutators.createMutators)({
+            models,
+            environment: "client",
+            authData,
+            can: permissionsHelpers.can
           });
-        },
-        mutators,
-        ...props,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SetZeroInstance, {}),
-          children
-        ]
-      })
-    });
-  }, SetZeroInstance = function() {
-    var zero2 = (0, import_react.useZero)();
-    return zero2 !== latestZeroInstance && (latestZeroInstance = zero2), null;
-  };
+        }, [models, authData]);
+      return disable ? children : /* @__PURE__ */(0, import_jsx_runtime.jsx)(AuthDataContext.Provider, {
+        value: authData,
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_react.ZeroProvider, {
+          schema,
+          kvStore: "mem",
+          onError: function (error) {
+            console.error("Zero Error:", error), zeroEvents.emit({
+              type: "error",
+              message: error
+            });
+          },
+          mutators,
+          ...props,
+          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(SetZeroInstance, {}), children]
+        })
+      });
+    },
+    SetZeroInstance = function () {
+      var zero2 = (0, import_react.useZero)();
+      return zero2 !== latestZeroInstance && (latestZeroInstance = zero2), null;
+    };
   return {
     zeroEvents,
     ProvideZero,
@@ -106,8 +168,4 @@ function createZeroClient(param) {
     zero
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createZeroClient
-});
-//# sourceMappingURL=createZeroClient.js.map
+//# sourceMappingURL=createZeroClient.native.js.map

package/dist/cjs/createZeroClient.native.js.map

@@ -1,6 +1 @@
-{
-  "version": 3,
-  "sources": ["../../src/createZeroClient.tsx"],
-  "mappings": "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",
-  "names": ["import_react", "zeroUseQuery", "param", "_jsx", "_jsxs", "zero"]
-}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroClient_exports","__export","createZeroClient","module","exports","import_jsx_runtime","require","import_zero","import_react","import_helpers","import_react2","import_createPermissions","import_createMutators","import_prettyFormatZeroQuery","import_useZeroDebug","import_state","_type_of","obj","Symbol","constructor","param","schema","models","disable","setSchema","modelWritePermissions","mapObject","val","permissions","latestZeroInstance","zero","Proxy","get","_","key","Reflect","permissionsHelpers","createPermissions","environment","zeroEvents","createEmitter","AuthDataContext","createContext","useAuthData","use","usePermission","table","objOrId","enabled","arguments","length","debug","authData","permission","query","baseQuery","one","where","eb","buildPermissionQuery","data","status","useQuery","console","info","prettyFormatZeroQuery","result","allowed","queryCache","Map","parseAny","x","_len","args","Array","_key","queryOrFn","paramsOrOptions","optionsArg","isPlainFunction","actualQuery","options","useMemo","fn","queryName","name","hasParams","params","opts","synced","syncedQuery","arg","set","out","process","env","NODE_ENV","useZeroDebug","type","ProvideZero","param2","children","props","mutators","setAuthData","createMutators","can","jsx","Provider"],"sources":["../../src/createZeroClient.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/createZeroServer.cjs

@@ -1,9 +1,7 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
     for (var name in all) __defProp(target, name, {
       get: all[name],
@@ -17,48 +15,39 @@ var __export = (target, all) => {
     });
     return to;
   };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: !0
+}), mod);
 var createZeroServer_exports = {};
 __export(createZeroServer_exports, {
   createZeroServer: () => createZeroServer
 });
 module.exports = __toCommonJS(createZeroServer_exports);
 var import_pg = require("@rocicorp/zero/pg"),
-  import_server = require("@rocicorp/zero/server"),
+  import_pg2 = require("@rocicorp/zero/server/adapters/pg"),
   import_helpers = require("@vxrn/helpers"),
-  import_postgres = __toESM(require("postgres"), 1),
+  import_pg3 = require("pg"),
   import_createPermissions = require("./createPermissions.cjs"),
-  import_context = require("./helpers/context.cjs"),
-  import_createMutators = require("./helpers/createMutators.cjs");
+  import_createMutators = require("./helpers/createMutators.cjs"),
+  import_mutatorContext = require("./helpers/mutatorContext.cjs"),
+  import_state = require("./state.cjs");
 function createZeroServer({
   createServerActions,
   database,
   schema,
-  models
+  models,
+  queries
 }) {
-  const dbString = (0, import_helpers.assertString)(database, '"database" prop'),
-    db = (0, import_postgres.default)(dbString),
-    zeroServerDatabase = new import_server.ZQLDatabase(new import_pg.PostgresJSConnection(
-    // TODO if you have duplicate postgres due to zero having its own in node_modules TS types break
-    db), schema),
+  (0, import_state.setSchema)(schema);
+  const dbString = (0, import_helpers.assertString)(database, 'createZeroServer "database"'),
+    zeroDb = (0, import_pg2.zeroNodePg)(schema, new import_pg3.Pool({
+      connectionString: dbString
+    })),
     permissions = (0, import_createPermissions.createPermissions)({
       environment: "server",
-      schema,
-      models,
-      getContext: import_context.context
+      schema
     }),
-    processor = new import_pg.PushProcessor(zeroServerDatabase),
+    processor = new import_pg.PushProcessor(zeroDb),
     handleMutationRequest = async ({
       authData,
       request,
@@ -87,6 +76,22 @@ function createZeroServer({
         asyncTasks
       };
     },
+    handleQueryRequest = async ({
+      authData,
+      request
+    }) => {
+      function getQuery(name, args) {
+        const q = queries?.[name];
+        if (!q) throw new Error(`No such query: ${name}`);
+        return {
+          // @ts-expect-error zero bug atm
+          query: q(...args)
+        };
+      }
+      return (0, import_state.setAuthData)(authData || {}), {
+        response: await (0, import_pg.handleGetQueriesRequest)(getQuery, schema, request)
+      };
+    },
     mutate = async (run, authData) => {
       const asyncTasks = [],
         mutators = (0, import_createMutators.createMutators)({
@@ -108,19 +113,19 @@ function createZeroServer({
     };
   async function transaction(query2) {
     try {
-      if ((0, import_context.isInZeroMutation)()) {
+      if ((0, import_mutatorContext.isInZeroMutation)()) {
         const {
           tx
-        } = (0, import_context.context)();
+        } = (0, import_mutatorContext.mutatorContext)();
         return await query2(tx);
       }
-      return await zeroServerDatabase.transaction(query2, dummyTransactionInput);
+      return await zeroDb.transaction(query2, dummyTransactionInput);
     } catch (err) {
       throw console.error(`Error running transaction(): ${err}`), err;
     }
   }
-  async function query(cb) {
-    return await transaction(async tx => await cb(tx.query));
+  function query(cb) {
+    return transaction(async tx => cb(tx.query));
   }
   const dummyTransactionInput = {
     clientGroupID: "unused",
@@ -130,6 +135,7 @@ function createZeroServer({
   };
   return {
     handleMutationRequest,
+    handleQueryRequest,
     transaction,
     mutate,
     query

package/dist/cjs/createZeroServer.js

@@ -1,8 +1,7 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: !0 });
@@ -12,38 +11,30 @@ var __export = (target, all) => {
       !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
-  mod
-)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var createZeroServer_exports = {};
 __export(createZeroServer_exports, {
   createZeroServer: () => createZeroServer
 });
 module.exports = __toCommonJS(createZeroServer_exports);
-var import_pg = require("@rocicorp/zero/pg"), import_server = require("@rocicorp/zero/server"), import_helpers = require("@vxrn/helpers"), import_postgres = __toESM(require("postgres"), 1), import_createPermissions = require("./createPermissions"), import_context = require("./helpers/context"), import_createMutators = require("./helpers/createMutators");
+var import_pg = require("@rocicorp/zero/pg"), import_pg2 = require("@rocicorp/zero/server/adapters/pg"), import_helpers = require("@vxrn/helpers"), import_pg3 = require("pg"), import_createPermissions = require("./createPermissions"), import_createMutators = require("./helpers/createMutators"), import_mutatorContext = require("./helpers/mutatorContext"), import_state = require("./state");
 function createZeroServer({
   createServerActions,
   database,
   schema,
-  models
+  models,
+  queries
 }) {
-  const dbString = (0, import_helpers.assertString)(database, '"database" prop'), db = (0, import_postgres.default)(dbString), zeroServerDatabase = new import_server.ZQLDatabase(
-    new import_pg.PostgresJSConnection(
-      // TODO if you have duplicate postgres due to zero having its own in node_modules TS types break
-      db
-    ),
-    schema
+  (0, import_state.setSchema)(schema);
+  const dbString = (0, import_helpers.assertString)(database, 'createZeroServer "database"'), zeroDb = (0, import_pg2.zeroNodePg)(
+    schema,
+    new import_pg3.Pool({
+      connectionString: dbString
+    })
   ), permissions = (0, import_createPermissions.createPermissions)({
     environment: "server",
-    schema,
-    models,
-    getContext: import_context.context
-  }), processor = new import_pg.PushProcessor(zeroServerDatabase), handleMutationRequest = async ({
+    schema
+  }), processor = new import_pg.PushProcessor(zeroDb), handleMutationRequest = async ({
     authData,
     request,
     skipAsyncTasks
@@ -68,6 +59,22 @@ function createZeroServer({
       response,
       asyncTasks
     };
+  }, handleQueryRequest = async ({
+    authData,
+    request
+  }) => {
+    function getQuery(name, args) {
+      const q = queries?.[name];
+      if (!q)
+        throw new Error(`No such query: ${name}`);
+      return {
+        // @ts-expect-error zero bug atm
+        query: q(...args)
+      };
+    }
+    return (0, import_state.setAuthData)(authData || {}), {
+      response: await (0, import_pg.handleGetQueriesRequest)(getQuery, schema, request)
+    };
   }, mutate = async (run, authData) => {
     const asyncTasks = [], mutators = (0, import_createMutators.createMutators)({
       models,
@@ -88,17 +95,17 @@ function createZeroServer({
   };
   async function transaction(query2) {
     try {
-      if ((0, import_context.isInZeroMutation)()) {
-        const { tx } = (0, import_context.context)();
+      if ((0, import_mutatorContext.isInZeroMutation)()) {
+        const { tx } = (0, import_mutatorContext.mutatorContext)();
         return await query2(tx);
       }
-      return await zeroServerDatabase.transaction(query2, dummyTransactionInput);
+      return await zeroDb.transaction(query2, dummyTransactionInput);
     } catch (err) {
       throw console.error(`Error running transaction(): ${err}`), err;
     }
   }
-  async function query(cb) {
-    return await transaction(async (tx) => await cb(tx.query));
+  function query(cb) {
+    return transaction(async (tx) => cb(tx.query));
   }
   const dummyTransactionInput = {
     clientGroupID: "unused",
@@ -108,6 +115,7 @@ function createZeroServer({
   };
   return {
     handleMutationRequest,
+    handleQueryRequest,
     transaction,
     mutate,
     query

package/dist/cjs/createZeroServer.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createZeroServer.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,gBAAoD,8BACpD,gBAA4B,kCAC5B,iBAAuC,0BACvC,kBAAqB,iCACrB,2BAAkC,gCAClC,iBAA0C,8BAC1C,wBAA+B;AASxB,SAAS,iBAId;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAQG;AACD,QAAM,eAAW,6BAAa,UAAU,iBAAiB,GACnD,SAAK,gBAAAA,SAAS,QAAQ,GAEtB,qBAAqB,IAAI;AAAA,IAC7B,IAAI;AAAA;AAAA,MAEF;AAAA,IACF;AAAA,IACA;AAAA,EACF,GAEM,kBAAc,4CAA0B;AAAA,IAC5C,aAAa;AAAA,IACb;AAAA,IACA;AAAA,IACA,YAAY;AAAA,EACd,CAAC,GAEK,YAAY,IAAI,wBAAc,kBAAkB,GAEhD,wBAAwB,OAAO;AAAA,IACnC;AAAA,IACA;AAAA,IACA;AAAA,EACF,MAIM;AAEJ,UAAM,aAA4B,CAAC,GAE7B,eAAW,sCAAe;AAAA,MAC9B;AAAA,MACA,KAAK,YAAY;AAAA,MACjB;AAAA,MACA,aAAa;AAAA,MACb;AAAA,MACA;AAAA,IACF,CAAC,GAGK,WAAW,MAAM,UAAU,QAAQ,UAAU,OAAO;AAG1D,QAAI,CAAC,kBAAkB,WAAW,QAAQ;AACxC,YAAM,SAAK,yBAAS;AACpB,cAAQ,KAAK,wCAAwC,WAAW,MAAM,OAAO,EAAE,EAAE,GACjF,QAAQ,IAAI,WAAW,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,EACzC,KAAK,MAAM;AACV,gBAAQ,KAAK,+BAA+B,EAAE,EAAE;AAAA,MAClD,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,gBAAQ,MAAM,8CAAuC,GAAG;AAAA,MAC1D,CAAC;AAAA,IACL;AAEA,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,GAEM,SAAS,OACb,KACA,aACG;AACH,UAAM,aAAyC,CAAC,GAE1C,eAAW,sCAAe;AAAA,MAC9B;AAAA,MACA,aAAa;AAAA,MACb;AAAA,MACA,UAAU;AAAA,QACR,IAAI;AAAA,QACJ,OAAO;AAAA,QACP,MAAM;AAAA,QACN,GAAG;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK,YAAY;AAAA,IACnB,CAAC;AAED,UAAM,YAAY,OAAO,OAAO;AAC9B,YAAM,IAAI,IAAI,QAAQ;AAAA,IACxB,CAAC,GAED,MAAM,QAAQ,IAAI,WAAW,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AAAA,EAC9C;AAEA,iBAAe,YAGbC,QAA6B;AAC7B,QAAI;AACF,cAAI,iCAAiB,GAAG;AACtB,cAAM,EAAE,GAAG,QAAI,wBAAQ;AACvB,eAAO,MAAMA,OAAM,EAAE;AAAA,MACvB;AAGA,aADe,MAAM,mBAAmB,YAAYA,QAAO,qBAAqB;AAAA,IAElF,SAAS,KAAK;AACZ,oBAAQ,MAAM,gCAAgC,GAAG,EAAE,GAC7C;AAAA,IACR;AAAA,EACF;AAMA,iBAAe,MACb,IAC+B;AAC/B,WAAO,MAAM,YAAY,OAAO,OACvB,MAAM,GAAG,GAAG,KAAK,CACzB;AAAA,EACH;AAGA,QAAM,wBAAkD;AAAA,IACtD,eAAe;AAAA,IACf,UAAU;AAAA,IACV,YAAY;AAAA,IACZ,gBAAgB;AAAA,EAClB;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
-  "names": ["postgres", "query"]
+  "mappings": "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",
+  "names": ["import_pg", "query"]
 }