@htlkg/data 0.0.1 → 0.0.3

package/dist/index.d.ts

@@ -1,8 +1,12 @@
-export { AstroAmplifyConfig, generateClient, generateServerClient } from './client/index.js';
-export { getAccount, getAccountWithBrands, getBrand, getBrandWithProducts, getProduct, getProductInstance, getUser, getUserByCognitoId, getUserByEmail, listAccounts, listActiveBrands, listActiveProducts, listActiveUsers, listBrands, listBrandsByAccount, listEnabledProductInstancesByBrand, listProductInstancesByAccount, listProductInstancesByBrand, listProducts, listUsers, listUsersByAccount } from './queries/index.js';
+export { AstroAmplifyConfig, generateClient, generateServerClient, getSharedClient, resetSharedClient as resetClientInstance, resetSharedClient } from './client/index.js';
+export { executePublicQuery, executeServerQuery, getAccount, getAccountWithBrands, getBrand, getBrandWithProducts, getProduct, getProductInstance, getUser, getUserByCognitoId, getUserByEmail, listAccounts, listActiveBrands, listActiveProducts, listActiveUsers, listBrands, listBrandsByAccount, listEnabledProductInstancesByBrand, listProductInstancesByAccount, listProductInstancesByBrand, listProducts, listUsers, listUsersByAccount } from './queries/index.js';
 export { CreateAccountInput, CreateBrandInput, CreateUserInput, UpdateAccountInput, UpdateBrandInput, UpdateUserInput, createAccount, createBrand, createUser, deleteAccount, deleteBrand, deleteUser, updateAccount, updateBrand, updateUser } from './mutations/index.js';
-export { UseAccountsOptions, UseAccountsReturn, UseBrandsOptions, UseBrandsReturn, UseProductsOptions, UseProductsReturn, UseUsersOptions, UseUsersReturn, useAccounts, useBrands, useProducts, useUsers } from './hooks/index.js';
-import 'astro';
+export { BaseHookOptions, CreateDataHookOptions, DataHookReturn, InferHookReturn, UseAccountsOptions, UseAccountsReturn, UseBrandsOptions, UseBrandsReturn, UseProductsOptions, UseProductsReturn, UseUsersOptions, UseUsersReturn, createDataHook, useAccounts, useBrands, useProducts, useUsers } from './hooks/index.js';
+export { InferStoreType, ResourceStores, StoreConfig, createResourceStores, createSingleStore, createStore } from './stores/index.js';
 import 'aws-amplify/data';
+import 'aws-amplify';
+import 'astro';
+import 'aws-amplify/api/internals';
 import '@htlkg/core/types';
 import 'vue';
+import 'nanostores';

package/dist/index.js

@@ -1,30 +1,31 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+// src/client/index.ts
+import { generateClient as generateDataClient } from "aws-amplify/data";
 
-// ../../node_modules/.pnpm/aws-amplify@6.15.8/node_modules/aws-amplify/dist/esm/api/index.mjs
-var api_exports = {};
-__reExport(api_exports, api_star);
-import * as api_star from "@aws-amplify/api";
+// src/client/server.ts
+import {
+  generateClientWithAmplifyInstance
+} from "aws-amplify/api/internals";
+import { getAmplifyServerContext } from "aws-amplify/adapter-core/internals";
+import { createRunWithAmplifyServerContext, createLogger } from "@htlkg/core/amplify-astro-adapter";
+var log = createLogger("server-client");
 
 // src/client/index.ts
+var sharedClientInstance = null;
+function getSharedClient() {
+  if (!sharedClientInstance) {
+    sharedClientInstance = generateDataClient();
+  }
+  return sharedClientInstance;
+}
+function resetSharedClient() {
+  sharedClientInstance = null;
+}
 function generateClient() {
-  return (0, api_exports.generateClient)();
+  return generateDataClient();
 }
 function generateServerClient(options) {
-  throw new Error(
-    "[generateServerClient] Not yet implemented in modular architecture. Please use generateServerClient from @htlkg/shared/lib/graphql for now. This will be properly implemented when the Amplify Astro adapter is migrated."
-  );
+  const client = generateDataClient();
+  return client;
 }
 
 // src/queries/brands.ts
@@ -356,6 +357,34 @@ async function listEnabledProductInstancesByBrand(client, brandId, options) {
   }
 }
 
+// src/queries/server-helpers.ts
+async function executeServerQuery(astro, runWithAmplifyServerContext, operation) {
+  const result = await runWithAmplifyServerContext({
+    astroServerContext: {
+      cookies: astro.cookies,
+      request: astro.request
+    },
+    operation: async (contextSpec) => {
+      const client = generateServerClient();
+      return await operation(client);
+    }
+  });
+  return result;
+}
+async function executePublicQuery(astro, runWithAmplifyServerContext, operation) {
+  const result = await runWithAmplifyServerContext({
+    astroServerContext: {
+      cookies: astro.cookies,
+      request: astro.request
+    },
+    operation: async (_contextSpec) => {
+      const client = generateServerClient({ authMode: "apiKey" });
+      return await operation(client);
+    }
+  });
+  return result;
+}
+
 // src/mutations/brands.ts
 async function createBrand(client, input) {
   try {
@@ -479,204 +508,295 @@ async function deleteUser(client, id) {
   }
 }
 
-// src/hooks/useBrands.ts
+// src/hooks/createDataHook.ts
 import { ref, computed, onMounted } from "vue";
-function useBrands(options = {}) {
+function createDataHook(config) {
   const {
-    filter: baseFilter,
-    limit,
-    autoFetch = true,
-    accountId,
-    activeOnly
-  } = options;
-  const brands = ref([]);
-  const loading = ref(false);
-  const error = ref(null);
-  let filter = baseFilter || {};
-  if (accountId) {
-    filter = { ...filter, accountId: { eq: accountId } };
-  }
-  if (activeOnly) {
-    filter = { ...filter, status: { eq: "active" } };
-  }
-  const activeBrands = computed(
-    () => brands.value.filter((b) => b.status === "active")
-  );
-  async function fetch() {
-    loading.value = true;
-    error.value = null;
-    try {
-      const client = generateClient();
-      const { data, errors } = await client.models.Brand.list({
-        filter: Object.keys(filter).length > 0 ? filter : void 0,
-        limit
-      });
-      if (errors) {
-        throw new Error(errors[0]?.message || "Failed to fetch brands");
+    model,
+    defaultLimit,
+    selectionSet,
+    transform,
+    buildFilter: buildFilter4,
+    computedProperties,
+    dataPropertyName = "data"
+  } = config;
+  return function useData(options = {}) {
+    const { filter: baseFilter, limit = defaultLimit, autoFetch = true } = options;
+    const data = ref([]);
+    const loading = ref(false);
+    const error = ref(null);
+    const getFilter = () => {
+      if (buildFilter4) {
+        return buildFilter4(options);
+      }
+      return baseFilter && Object.keys(baseFilter).length > 0 ? baseFilter : void 0;
+    };
+    async function fetch() {
+      loading.value = true;
+      error.value = null;
+      try {
+        const client = getSharedClient();
+        const queryOptions = {
+          filter: getFilter(),
+          limit
+        };
+        if (selectionSet) {
+          queryOptions.selectionSet = selectionSet;
+        }
+        const { data: responseData, errors } = await client.models[model].list(queryOptions);
+        if (errors) {
+          throw new Error(errors[0]?.message || `Failed to fetch ${model}`);
+        }
+        const items = responseData || [];
+        data.value = transform ? items.map(transform) : items;
+      } catch (e) {
+        error.value = e;
+        console.error(`[use${model}] Error fetching ${model}:`, e);
+      } finally {
+        loading.value = false;
       }
-      brands.value = data || [];
-    } catch (e) {
-      error.value = e;
-      console.error("[useBrands] Error fetching brands:", e);
-    } finally {
-      loading.value = false;
     }
+    const computedRefs = {};
+    if (computedProperties) {
+      for (const [key, fn] of Object.entries(computedProperties)) {
+        computedRefs[key] = computed(() => fn(data.value));
+      }
+    }
+    if (autoFetch) {
+      onMounted(() => {
+        fetch();
+      });
+    }
+    const result = {
+      data,
+      loading,
+      error,
+      refetch: fetch,
+      computed: computedRefs
+    };
+    if (dataPropertyName !== "data") {
+      result[dataPropertyName] = data;
+    }
+    for (const [key, computedRef] of Object.entries(computedRefs)) {
+      result[key] = computedRef;
+    }
+    return result;
+  };
+}
+
+// src/hooks/useBrands.ts
+function buildFilter(options) {
+  let filter = options.filter || {};
+  if (options.accountId) {
+    filter = { ...filter, accountId: { eq: options.accountId } };
   }
-  if (autoFetch) {
-    onMounted(() => {
-      fetch();
-    });
+  if (options.activeOnly) {
+    filter = { ...filter, status: { eq: "active" } };
   }
+  return Object.keys(filter).length > 0 ? filter : void 0;
+}
+var useBrandsInternal = createDataHook({
+  model: "Brand",
+  dataPropertyName: "brands",
+  buildFilter,
+  computedProperties: {
+    activeBrands: (brands) => brands.filter((b) => b.status === "active")
+  }
+});
+function useBrands(options = {}) {
+  const result = useBrandsInternal(options);
   return {
-    brands,
-    activeBrands,
-    loading,
-    error,
-    refetch: fetch
+    brands: result.brands,
+    activeBrands: result.activeBrands,
+    loading: result.loading,
+    error: result.error,
+    refetch: result.refetch
   };
 }
 
 // src/hooks/useAccounts.ts
-import { ref as ref2, onMounted as onMounted2 } from "vue";
+var useAccountsInternal = createDataHook({
+  model: "Account",
+  dataPropertyName: "accounts"
+});
 function useAccounts(options = {}) {
-  const { filter, limit, autoFetch = true } = options;
-  const accounts = ref2([]);
-  const loading = ref2(false);
-  const error = ref2(null);
-  async function fetch() {
-    loading.value = true;
-    error.value = null;
-    try {
-      const client = generateClient();
-      const { data, errors } = await client.models.Account.list({
-        filter,
-        limit
-      });
-      if (errors) {
-        throw new Error(errors[0]?.message || "Failed to fetch accounts");
-      }
-      accounts.value = data || [];
-    } catch (e) {
-      error.value = e;
-      console.error("[useAccounts] Error fetching accounts:", e);
-    } finally {
-      loading.value = false;
-    }
-  }
-  if (autoFetch) {
-    onMounted2(() => {
-      fetch();
-    });
-  }
+  const result = useAccountsInternal(options);
   return {
-    accounts,
-    loading,
-    error,
-    refetch: fetch
+    accounts: result.accounts,
+    loading: result.loading,
+    error: result.error,
+    refetch: result.refetch
   };
 }
 
 // src/hooks/useUsers.ts
-import { ref as ref3, onMounted as onMounted3 } from "vue";
-function useUsers(options = {}) {
-  const { filter: baseFilter, limit, autoFetch = true, brandId, accountId } = options;
-  const users = ref3([]);
-  const loading = ref3(false);
-  const error = ref3(null);
-  let filter = baseFilter || {};
-  if (brandId) {
-    filter = { ...filter, brandIds: { contains: brandId } };
-  }
-  if (accountId) {
-    filter = { ...filter, accountIds: { contains: accountId } };
-  }
-  async function fetch() {
-    loading.value = true;
-    error.value = null;
-    try {
-      const client = generateClient();
-      const { data, errors } = await client.models.User.list({
-        filter: Object.keys(filter).length > 0 ? filter : void 0,
-        limit
-      });
-      if (errors) {
-        throw new Error(errors[0]?.message || "Failed to fetch users");
-      }
-      users.value = data || [];
-    } catch (e) {
-      error.value = e;
-      console.error("[useUsers] Error fetching users:", e);
-    } finally {
-      loading.value = false;
-    }
+function buildFilter2(options) {
+  let filter = options.filter || {};
+  if (options.brandId) {
+    filter = { ...filter, brandIds: { contains: options.brandId } };
   }
-  if (autoFetch) {
-    onMounted3(() => {
-      fetch();
-    });
+  if (options.accountId) {
+    filter = { ...filter, accountIds: { contains: options.accountId } };
   }
+  return Object.keys(filter).length > 0 ? filter : void 0;
+}
+var useUsersInternal = createDataHook({
+  model: "User",
+  dataPropertyName: "users",
+  buildFilter: buildFilter2
+});
+function useUsers(options = {}) {
+  const result = useUsersInternal(options);
   return {
-    users,
-    loading,
-    error,
-    refetch: fetch
+    users: result.users,
+    loading: result.loading,
+    error: result.error,
+    refetch: result.refetch
   };
 }
 
 // src/hooks/useProducts.ts
-import { ref as ref4, computed as computed2, onMounted as onMounted4 } from "vue";
-function useProducts(options = {}) {
-  const { filter: baseFilter, limit, autoFetch = true, activeOnly } = options;
-  const products = ref4([]);
-  const loading = ref4(false);
-  const error = ref4(null);
-  let filter = baseFilter || {};
-  if (activeOnly) {
+function buildFilter3(options) {
+  let filter = options.filter || {};
+  if (options.activeOnly) {
     filter = { ...filter, isActive: { eq: true } };
   }
-  const activeProducts = computed2(
-    () => products.value.filter((p) => p.isActive === true)
-  );
-  async function fetch() {
-    loading.value = true;
-    error.value = null;
-    try {
-      const client = generateClient();
-      const { data, errors } = await client.models.Product.list({
-        filter: Object.keys(filter).length > 0 ? filter : void 0,
-        limit
-      });
-      if (errors) {
-        throw new Error(errors[0]?.message || "Failed to fetch products");
-      }
-      products.value = data || [];
-    } catch (e) {
-      error.value = e;
-      console.error("[useProducts] Error fetching products:", e);
-    } finally {
-      loading.value = false;
-    }
-  }
-  if (autoFetch) {
-    onMounted4(() => {
-      fetch();
-    });
+  return Object.keys(filter).length > 0 ? filter : void 0;
+}
+var useProductsInternal = createDataHook({
+  model: "Product",
+  dataPropertyName: "products",
+  buildFilter: buildFilter3,
+  computedProperties: {
+    activeProducts: (products) => products.filter((p) => p.isActive === true)
   }
+});
+function useProducts(options = {}) {
+  const result = useProductsInternal(options);
   return {
-    products,
-    activeProducts,
-    loading,
-    error,
-    refetch: fetch
+    products: result.products,
+    activeProducts: result.activeProducts,
+    loading: result.loading,
+    error: result.error,
+    refetch: result.refetch
+  };
+}
+
+// ../../node_modules/.pnpm/nanostores@1.1.0/node_modules/nanostores/clean-stores/index.js
+var clean = /* @__PURE__ */ Symbol("clean");
+
+// ../../node_modules/.pnpm/nanostores@1.1.0/node_modules/nanostores/atom/index.js
+var listenerQueue = [];
+var lqIndex = 0;
+var QUEUE_ITEMS_PER_LISTENER = 4;
+var epoch = 0;
+var atom = /* @__NO_SIDE_EFFECTS__ */ (initialValue) => {
+  let listeners = [];
+  let $atom = {
+    get() {
+      if (!$atom.lc) {
+        $atom.listen(() => {
+        })();
+      }
+      return $atom.value;
+    },
+    lc: 0,
+    listen(listener) {
+      $atom.lc = listeners.push(listener);
+      return () => {
+        for (let i = lqIndex + QUEUE_ITEMS_PER_LISTENER; i < listenerQueue.length; ) {
+          if (listenerQueue[i] === listener) {
+            listenerQueue.splice(i, QUEUE_ITEMS_PER_LISTENER);
+          } else {
+            i += QUEUE_ITEMS_PER_LISTENER;
+          }
+        }
+        let index = listeners.indexOf(listener);
+        if (~index) {
+          listeners.splice(index, 1);
+          if (!--$atom.lc) $atom.off();
+        }
+      };
+    },
+    notify(oldValue, changedKey) {
+      epoch++;
+      let runListenerQueue = !listenerQueue.length;
+      for (let listener of listeners) {
+        listenerQueue.push(listener, $atom.value, oldValue, changedKey);
+      }
+      if (runListenerQueue) {
+        for (lqIndex = 0; lqIndex < listenerQueue.length; lqIndex += QUEUE_ITEMS_PER_LISTENER) {
+          listenerQueue[lqIndex](
+            listenerQueue[lqIndex + 1],
+            listenerQueue[lqIndex + 2],
+            listenerQueue[lqIndex + 3]
+          );
+        }
+        listenerQueue.length = 0;
+      }
+    },
+    /* It will be called on last listener unsubscribing.
+       We will redefine it in onMount and onStop. */
+    off() {
+    },
+    set(newValue) {
+      let oldValue = $atom.value;
+      if (oldValue !== newValue) {
+        $atom.value = newValue;
+        $atom.notify(oldValue);
+      }
+    },
+    subscribe(listener) {
+      let unbind = $atom.listen(listener);
+      listener($atom.value);
+      return unbind;
+    },
+    value: initialValue
   };
+  if (process.env.NODE_ENV !== "production") {
+    $atom[clean] = () => {
+      listeners = [];
+      $atom.lc = 0;
+      $atom.off();
+    };
+  }
+  return $atom;
+};
+
+// src/stores/createStores.ts
+function capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+function createResourceStores(shared, config) {
+  const { name, relations = [] } = config;
+  const stores = {};
+  stores.$data = shared(name, atom([]));
+  for (const relation of relations) {
+    const storeKey = `$${relation}`;
+    const sharedKey = `${name}${capitalize(relation)}`;
+    stores[storeKey] = shared(sharedKey, atom([]));
+  }
+  return stores;
+}
+function createStore(shared, name, defaultValue = []) {
+  return shared(name, atom(defaultValue));
+}
+function createSingleStore(shared, name, defaultValue) {
+  return shared(name, atom(defaultValue));
 }
 export {
   createAccount,
   createBrand,
+  createDataHook,
+  createResourceStores,
+  createSingleStore,
+  createStore,
   createUser,
   deleteAccount,
   deleteBrand,
   deleteUser,
+  executePublicQuery,
+  executeServerQuery,
   generateClient,
   generateServerClient,
   getAccount,
@@ -685,6 +805,7 @@ export {
   getBrandWithProducts,
   getProduct,
   getProductInstance,
+  getSharedClient,
   getUser,
   getUserByCognitoId,
   getUserByEmail,
@@ -700,6 +821,8 @@ export {
   listProducts,
   listUsers,
   listUsersByAccount,
+  resetSharedClient as resetClientInstance,
+  resetSharedClient,
   updateAccount,
   updateBrand,
   updateUser,