@laboratoria/sdk-js 1.1.0 → 1.2.0

package/lib/core.js

@@ -4,7 +4,9 @@ import schema from '../schemas/core.json';
 
 const extended = {
   Country: {
+    primaryKey: 'code',
     plural: 'countries',
+    searchProps: ['code', 'name'],
   },
   User: {
     primaryKey: 'uid',
@@ -120,7 +122,7 @@ const extended = {
   Contract: {
     inputProps: [
       'user',
-      'countryCode',
+      'country',
       'currency',
       'isEmployment',
       'feeBasis',
@@ -129,17 +131,14 @@ const extended = {
       'start',
       'end',
     ],
-    properties: {
-      countryCode: {
-        enum: ['BR', 'CL', 'CO', 'MX', 'PE'],
-      },
-    },
+    searchProps: ['user.firstName'],
+    getOptionLabel: ({ id, user }) => `${user?.firstName} (id: ${id})`,
   },
   Gig: {
     inputProps: [
-      // 'contract',
       'cohort',
       'user',
+      'contract',
       'role',
       'hoursPerWeek',
       'start',

package/lib/model.js

@@ -105,7 +105,7 @@ const createBuildURL = collectionName => (id, q) => {
 
 const serializeData = (data, schema) => {
   const hasInputProps = Array.isArray(schema.inputProps);
-  const payload = Object.keys(data).reduce(
+  return Object.keys(data).reduce(
     (memo, key) => {
       if (hasInputProps && !schema.inputProps.includes(key)) {
         return memo;
@@ -120,14 +120,6 @@ const serializeData = (data, schema) => {
     },
     {},
   );
-
-  // {
-  //   signupCohort: {
-  //     connect: { id: signupCohort.id },
-  //   },
-  // }
-
-  return payload;
 };
 
 
@@ -136,15 +128,17 @@ export const createModel = (baseUrl, state, collectionName, schema = {}) => {
   const validator = createValidator(schema);
   const buildURL = createBuildURL(collectionName);
   const req = (...args) => createClient(baseUrl, state.authUser)(...args);
-  const create = q => req(buildURL(), {
+  const create = ({ data, ...q }) => req(buildURL(null, q), {
     method: 'POST',
-    body: Object.assign(q, { data: serializeData(q.data, schema) }),
-  });
-
-  const put = q => req(buildURL(q.where[primaryKey]), {
-    method: 'PUT',
-    body: Object.assign(q, { data: serializeData(q.data, schema) }),
+    body: serializeData(data, schema),
   });
+  const put = ({ data, ...q }) => {
+    const { where, ...rest } = q;
+    return req(buildURL(where[primaryKey], rest), {
+      method: 'PUT',
+      body: serializeData(data, schema),
+    });
+  };
 
   const parse = data => {
     const parsed = Object.keys(data).reduce(
@@ -200,7 +194,7 @@ export const createModel = (baseUrl, state, collectionName, schema = {}) => {
 
   return {
     get schema() {
-      return schema;
+      return { ...schema, primaryKey };
     },
     get relations() {
       return relations;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laboratoria/sdk-js",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Laboratoria JavaScript (browser) SDK",
   "scripts": {
     "test": "jest --verbose --coverage",
@@ -12,7 +12,7 @@
     "firebase": "^9.6.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.12",
+    "@babel/core": "^7.17.0",
     "@babel/plugin-transform-modules-commonjs": "^7.16.8",
     "babel-jest": "^27.4.6",
     "jest": "^27.4.7",