@awsless/awsless 0.0.195 → 0.0.199

package/dist/bin.js

@@ -3000,9 +3000,10 @@ var pubsubFeature = defineFeature({
   onStack(ctx) {
     for (const [id, props] of Object.entries(ctx.stackConfig.pubsub ?? {})) {
       const group = new Node8(ctx.stack, "pubsub", id);
-      const { lambda } = createLambdaFunction(group, ctx, `pubsub`, "function", props.consumer);
+      const { lambda } = createLambdaFunction(group, ctx, `pubsub`, id, props.consumer);
+      const name = formatLocalResourceName(ctx.app.name, ctx.stack.name, "pubsub", id);
       const topic = new aws8.iot.TopicRule(group, "rule", {
-        name: formatLocalResourceName(ctx.app.name, ctx.stack.name, "pubsub", id).replaceAll("-", "_"),
+        name: name.replaceAll("-", "_"),
         sql: props.sql,
         sqlVersion: props.sqlVersion,
         actions: [{ lambda: { functionArn: lambda.arn } }]
@@ -3626,6 +3627,25 @@ var httpFeature = defineFeature({
 
 // src/feature/search/index.ts
 import { Node as Node16, aws as aws16 } from "@awsless/formation";
+import { constantCase as constantCase5 } from "change-case";
+var typeGenCode6 = `
+import {
+	migrate as sMigrate,
+	search as sSearch,
+	indexItem as sIndexItem,
+	updateItem as sUpdateItem,
+	deleteItem as sDeleteItem,
+} from '@awsless/open-search'
+
+type Store<Name extends string> = {
+	readonly name: Name
+	readonly migrate: (...args: Parameters<typeof sMigrate>) => ReturnType<typeof sMigrate>
+	readonly search: (...args: Parameters<typeof sMigrate>) => ReturnType<typeof sSearch>
+	readonly indexItem: (...args: Parameters<typeof sIndexItem>) => ReturnType<typeof sIndexItem>
+	readonly updateItem: (...args: Parameters<typeof sUpdateItem>) => ReturnType<typeof sUpdateItem>
+	readonly deleteItem: (...args: Parameters<typeof sDeleteItem>) => ReturnType<typeof sDeleteItem>
+}
+`;
 var searchFeature = defineFeature({
   name: "search",
   async onTypeGen(ctx) {
@@ -3639,13 +3659,14 @@ var searchFeature = defineFeature({
       }
       resources.addType(stack.name, list4);
     }
+    gen.addCode(typeGenCode6);
     gen.addInterface("SearchResources", resources);
     await ctx.write("search.d.ts", gen, true);
   },
   onStack(ctx) {
     for (const [id, props] of Object.entries(ctx.stackConfig.searchs ?? {})) {
       const group = new Node16(ctx.stack, "search", id);
-      const domain = new aws16.openSearch.Domain(group, "domain", {
+      const openSearch = new aws16.openSearch.Domain(group, "domain", {
         // name: formatLocalResourceName(ctx.app.name, ctx.stack.name, this.name, id),
         version: props.version,
         storageSize: props.storage,
@@ -3657,13 +3678,13 @@ var searchFeature = defineFeature({
           statements: [
             {
               principal: "lambda.amazonaws.com",
-              sourceArn: `arn:aws:lambfa:${ctx.appConfig.region}:${ctx.accountId}:function:${ctx.app.name}--${ctx.stack.name}--*`
+              sourceArn: `arn:aws:lambda:${ctx.appConfig.region}:${ctx.accountId}:function:${ctx.app.name}--${ctx.stack.name}--*`
             }
           ]
         }
       });
       if (props.vpc) {
-        domain.setVpc({
+        openSearch.setVpc({
           securityGroupIds: [ctx.shared.get(`vpc-security-group-id`)],
           subnetIds: [
             ctx.shared.get("vpc-private-subnet-id-1"),
@@ -3671,10 +3692,14 @@ var searchFeature = defineFeature({
           ]
         });
       }
-      ctx.onFunction(({ policy }) => {
+      ctx.onFunction(({ lambda, policy }) => {
+        lambda.addEnvironment(
+          `SEARCH_${constantCase5(ctx.stack.name)}_${constantCase5(id)}_DOMAIN`,
+          openSearch.domainEndpoint
+        );
         policy.addStatement({
           actions: ["es:*"],
-          resources: [domain.arn]
+          resources: [openSearch.arn]
         });
       });
     }

package/dist/server.js

@@ -262,11 +262,42 @@ var Config = /* @__PURE__ */ new Proxy(
 );
 
 // src/lib/resource/search.ts
+import { constantCase as constantCase4 } from "change-case";
+import {
+  searchClient,
+  migrate as sMigrate,
+  search as sSearch,
+  indexItem as sIndexItem,
+  updateItem as sUpdateItem,
+  deleteItem as sDeleteItem
+} from "@awsless/open-search";
 var getSearchName = bindLocalResourceName("search");
+var getSearchProps = (name, stack = STACK) => {
+  return {
+    domain: process.env[`CACHE_${constantCase4(stack)}_${constantCase4(name)}_DOMAIN`]
+  };
+};
 var Search = /* @__PURE__ */ createProxy((stack) => {
   return createProxy((name) => {
+    const { domain } = getSearchProps(name, stack);
+    const client = searchClient({ node: domain });
     return {
-      name: getSearchName(name, stack)
+      name: getSearchName(name, stack),
+      migrate(...args) {
+        return sMigrate(args[0], { client });
+      },
+      search(...args) {
+        return sSearch(args[0], { client, ...args[1] });
+      },
+      indexItem(...args) {
+        return sIndexItem(args[0], args[1], args[2], { client, ...args[3] });
+      },
+      updateItem(...args) {
+        return sUpdateItem(args[0], args[1], args[2], { client, ...args[3] });
+      },
+      deleteItem(...args) {
+        return sDeleteItem(args[0], args[1], { client, ...args[2] });
+      }
     };
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.195",
+  "version": "0.0.199",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,13 +29,14 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.18",
+    "@awsless/open-search": "^0.0.11",
     "@awsless/redis": "^0.0.12",
+    "@awsless/s3": "^0.0.10",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@awsless/s3": "^0.0.10",
     "@awsless/validate": "^0.0.13",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/ssm": "^0.0.7"
+    "@awsless/ssm": "^0.0.7",
+    "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
     "@aws-appsync/utils": "^1.5.0",
@@ -97,9 +98,9 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/duration": "^0.0.1",
-    "@awsless/size": "^0.0.1",
-    "@awsless/formation": "^0.0.15",
     "@awsless/graphql": "^0.0.9",
+    "@awsless/formation": "^0.0.15",
+    "@awsless/size": "^0.0.1",
     "@awsless/validate": "^0.0.13",
     "@awsless/code": "^0.0.10"
   },