@xube/kit-aws 0.0.46 → 0.0.47

package/dist/index.d.ts

@@ -1,6 +1,4 @@
 export * from "./resources/dynamodb/get";
 export * from "./resources/dynamodb/put";
-export * from "./resources/dynamodb/schema/item";
-export * from "./resources/dynamodb/schema/keys";
 export * from "./resources/dynamodb/query";
 export * from "./resources/dynamodb/transform";

package/dist/index.js

@@ -16,7 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./resources/dynamodb/get"), exports);
 __exportStar(require("./resources/dynamodb/put"), exports);
-__exportStar(require("./resources/dynamodb/schema/item"), exports);
-__exportStar(require("./resources/dynamodb/schema/keys"), exports);
 __exportStar(require("./resources/dynamodb/query"), exports);
 __exportStar(require("./resources/dynamodb/transform"), exports);

package/dist/resources/dynamodb/put.d.ts

@@ -4,4 +4,7 @@ export declare const putItemInTable: <TItem extends {
     id: string;
     PK: string;
     SK: string;
+    type: string;
+    s: number;
+    us?: number | undefined;
 }>(table: string, item: TItem, log?: XubeLog) => Promise<XubeResponse<boolean>>;

package/dist/resources/dynamodb/query.d.ts

@@ -1,7 +1,6 @@
-import { TableItem } from "./schema/item";
-import { PartialTableKey } from "./schema/keys";
 import { XubeResponse } from "@xube/kit-request";
 import { XubeLog } from "@xube/kit-log";
+import { PartialTableKey, TableItem } from "@xube/kit-aws-schema";
 export declare const queryItemsFromTable: (tableName: string, keys: PartialTableKey, indexName: string | undefined, keyLabels?: {
     partitionKey: string;
     sortKey?: string;

package/dist/resources/dynamodb/query.js

@@ -2,28 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryItemsFromTable = void 0;
 const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
-const item_1 = require("./schema/item");
-const keys_1 = require("./schema/keys");
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const kit_request_1 = require("@xube/kit-request");
 const kit_log_1 = require("@xube/kit-log");
+const kit_aws_schema_1 = require("@xube/kit-aws-schema");
 const ddbClient = new client_dynamodb_1.DynamoDBClient({ region: process.env.AWS_REGION });
 const ddbDocClient = lib_dynamodb_1.DynamoDBDocumentClient.from(ddbClient);
 const queryItemsFromTable = async (tableName, keys, indexName, keyLabels = {
-    partitionKey: keys_1.PARTITION_KEY,
-    sortKey: keys_1.SORT_KEY,
+    partitionKey: kit_aws_schema_1.PARTITION_KEY,
+    sortKey: kit_aws_schema_1.SORT_KEY,
 }, log = kit_log_1.XubeLog.getInstance()) => {
     let KeyConditionExpression = "#pk = :pkValue";
     let ExpressionAttributeNames = {
         "#pk": keyLabels.partitionKey,
     };
     let ExpressionAttributeValues = {
-        ":pkValue": keys[keys_1.PARTITION_KEY],
+        ":pkValue": keys[kit_aws_schema_1.PARTITION_KEY],
     };
-    if (keys[keys_1.SORT_KEY]) {
+    if (keys[kit_aws_schema_1.SORT_KEY]) {
         KeyConditionExpression += " AND begins_with(#sk, :skPrefix)";
-        ExpressionAttributeNames["#sk"] = keyLabels.sortKey ?? keys_1.SORT_KEY;
-        ExpressionAttributeValues[":skPrefix"] = keys[keys_1.SORT_KEY];
+        ExpressionAttributeNames["#sk"] = keyLabels.sortKey ?? kit_aws_schema_1.SORT_KEY;
+        ExpressionAttributeValues[":skPrefix"] = keys[kit_aws_schema_1.SORT_KEY];
     }
     const params = {
         TableName: tableName,
@@ -40,7 +39,7 @@ const queryItemsFromTable = async (tableName, keys, indexName, keyLabels = {
                 error: `No items found.`,
             });
         }
-        if (!(0, item_1.areTableItems)(response.Items)) {
+        if (!(0, kit_aws_schema_1.areTableItems)(response.Items)) {
             return new kit_request_1.XubeResponse({
                 statusCode: 500,
                 error: `Items returned from DynamoDB are not valid TableItems.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xube/kit-aws",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -18,14 +18,16 @@
   "homepage": "https://github.com/XubeLtd/dev-kit#readme",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.119",
-    "@xube/kit-build": "^0.0.46"
+    "@xube/kit-build": "^0.0.47"
   },
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.427.0",
     "@aws-sdk/lib-dynamodb": "^3.427.0",
     "@aws-sdk/util-dynamodb": "^3.427.0",
-    "@xube/kit-log": "^0.0.46",
-    "@xube/kit-request": "^0.0.46",
+    "@xube/kit-aws-schema": "^0.0.47",
+    "@xube/kit-log": "^0.0.47",
+    "@xube/kit-request": "^0.0.47",
+    "@xube/kit-schema": "^0.0.47",
     "zod": "^3.22.4"
   }
 }

package/src/index.ts

@@ -1,6 +1,4 @@
 export * from "./resources/dynamodb/get";
 export * from "./resources/dynamodb/put";
-export * from "./resources/dynamodb/schema/item";
-export * from "./resources/dynamodb/schema/keys";
 export * from "./resources/dynamodb/query";
 export * from "./resources/dynamodb/transform";

package/src/resources/dynamodb/put.ts

@@ -5,9 +5,9 @@ import {
   PutCommandOutput,
 } from "@aws-sdk/lib-dynamodb";
 import { XubeResponse } from "@xube/kit-request";
-import { TableItem } from "./schema/item";
 import { StatusCode } from "@xube/kit-constants";
 import { XubeLog } from "@xube/kit-log";
+import { TableItem } from "@xube/kit-aws-schema";
 
 const ddbClient = new DynamoDBClient({
   region: process.env.AWS_REGION,

package/src/resources/dynamodb/query.ts

@@ -1,14 +1,8 @@
 import { DynamoDBDocumentClient, QueryCommand } from "@aws-sdk/lib-dynamodb";
-import { TableItem, areTableItems } from "./schema/item";
-import {
-  PARTITION_KEY,
-  PartialTableKey,
-  SORT_KEY,
-  TableKey,
-} from "./schema/keys";
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { XubeResponse } from "@xube/kit-request";
 import { XubeLog } from "@xube/kit-log";
+import { PARTITION_KEY, PartialTableKey, SORT_KEY, TableItem, areTableItems } from "@xube/kit-aws-schema";
 
 const ddbClient = new DynamoDBClient({ region: process.env.AWS_REGION });
 const ddbDocClient = DynamoDBDocumentClient.from(ddbClient);

package/tsconfig.json

@@ -12,6 +12,12 @@
     {
       "path": "../kit-log"
     },
+    {
+      "path": "../kit-schema"
+    },
+    {
+      "path": "../kit-aws-schema"
+    },
     {
       "path": "../kit-request"
     }

package/dist/resources/dynamodb/schema/fields.d.ts

@@ -1 +0,0 @@
-export declare const ID_FIELD = "id";

package/dist/resources/dynamodb/schema/fields.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ID_FIELD = void 0;
-exports.ID_FIELD = "id";

package/dist/resources/dynamodb/schema/item.d.ts

@@ -1,25 +0,0 @@
-import { z } from "zod";
-export declare const TableItemSchema: z.ZodObject<{
-    id: z.ZodString;
-    PK: z.ZodString;
-    SK: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    id: string;
-    PK: string;
-    SK: string;
-}, {
-    id: string;
-    PK: string;
-    SK: string;
-}>;
-export type TableItem = z.infer<typeof TableItemSchema>;
-export declare const isTableItem: (obj: unknown) => obj is {
-    id: string;
-    PK: string;
-    SK: string;
-};
-export declare const areTableItems: (obj: unknown) => obj is {
-    id: string;
-    PK: string;
-    SK: string;
-}[];

package/dist/resources/dynamodb/schema/item.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.areTableItems = exports.isTableItem = exports.TableItemSchema = void 0;
-const fields_1 = require("./fields");
-const keys_1 = require("./keys");
-const zod_1 = require("zod");
-exports.TableItemSchema = zod_1.z
-    .object({
-    [fields_1.ID_FIELD]: zod_1.z.string(),
-})
-    .merge(keys_1.TableKeySchema);
-const isTableItem = (obj) => exports.TableItemSchema.passthrough().safeParse(obj).success;
-exports.isTableItem = isTableItem;
-const areTableItems = (obj) => {
-    return zod_1.z.array(exports.TableItemSchema.passthrough()).safeParse(obj).success;
-};
-exports.areTableItems = areTableItems;

package/dist/resources/dynamodb/schema/keys.d.ts

@@ -1,26 +0,0 @@
-import { z } from "zod";
-export declare const PARTITION_KEY = "PK";
-export declare const SORT_KEY = "SK";
-export declare const TableKeySchema: z.ZodObject<{
-    PK: z.ZodString;
-    SK: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    PK: string;
-    SK: string;
-}, {
-    PK: string;
-    SK: string;
-}>;
-export type TableKey = z.infer<typeof TableKeySchema>;
-export declare const PartialTableKey: z.ZodObject<{
-    PK: z.ZodString;
-    SK: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    PK: string;
-    SK?: string | undefined;
-}, {
-    PK: string;
-    SK?: string | undefined;
-}>;
-export type PartialTableKey = z.infer<typeof PartialTableKey>;
-export declare const getAggregateKeyFromTableKey: (tableKey: TableKey) => string;

package/dist/resources/dynamodb/schema/keys.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAggregateKeyFromTableKey = exports.PartialTableKey = exports.TableKeySchema = exports.SORT_KEY = exports.PARTITION_KEY = void 0;
-const zod_1 = require("zod");
-exports.PARTITION_KEY = "PK";
-exports.SORT_KEY = "SK";
-exports.TableKeySchema = zod_1.z.object({
-    [exports.PARTITION_KEY]: zod_1.z.string(),
-    [exports.SORT_KEY]: zod_1.z.string(),
-});
-exports.PartialTableKey = zod_1.z.object({
-    [exports.PARTITION_KEY]: zod_1.z.string(),
-    [exports.SORT_KEY]: zod_1.z.string().optional(),
-});
-const getAggregateKeyFromTableKey = (tableKey) => {
-    return `${tableKey[exports.PARTITION_KEY]}##${tableKey[exports.SORT_KEY]}`;
-};
-exports.getAggregateKeyFromTableKey = getAggregateKeyFromTableKey;

package/src/resources/dynamodb/schema/fields.ts

@@ -1 +0,0 @@
-export const ID_FIELD = "id"

package/src/resources/dynamodb/schema/item.ts

@@ -1,16 +0,0 @@
-import { ID_FIELD } from "./fields";
-import { PARTITION_KEY, SORT_KEY, TableKeySchema } from "./keys";
-import { z } from "zod";
-
-export const TableItemSchema = z
-  .object({
-    [ID_FIELD]: z.string(),
-  })
-  .merge(TableKeySchema);
-export type TableItem = z.infer<typeof TableItemSchema>;
-export const isTableItem = (obj: unknown): obj is TableItem =>
-  TableItemSchema.passthrough().safeParse(obj).success;
-
-export const areTableItems = (obj: unknown): obj is TableItem[] => {
-  return z.array(TableItemSchema.passthrough()).safeParse(obj).success;
-};

package/src/resources/dynamodb/schema/keys.ts

@@ -1,20 +0,0 @@
-import { z } from "zod";
-
-export const PARTITION_KEY = "PK";
-export const SORT_KEY = "SK";
-
-export const TableKeySchema = z.object({
-  [PARTITION_KEY]: z.string(),
-  [SORT_KEY]: z.string(),
-});
-export type TableKey = z.infer<typeof TableKeySchema>;
-
-export const PartialTableKey = z.object({
-  [PARTITION_KEY]: z.string(),
-  [SORT_KEY]: z.string().optional(),
-});
-export type PartialTableKey = z.infer<typeof PartialTableKey>;
-
-export const getAggregateKeyFromTableKey = (tableKey: TableKey) => {
-  return `${tableKey[PARTITION_KEY]}##${tableKey[SORT_KEY]}`;
-};