enable eslint and fix problems (#12)

.eslintignore

@@ -1,2 +1,4 @@
-.eslintrc.js
-**/*.json
+**/*.json
+**/lib-esm/**
+tsconfig.json
+tsconfig.base.json

.eslintrc.json

@@ -0,0 +1,40 @@
+{
+  "env": {
+    "es2021": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    // "plugin:jsdoc/recommended-typescript-error",
+    "prettier"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "root": true,
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "project": ["./packages/*/tsconfig.json"]
+  },
+  "plugins": [
+    "@typescript-eslint",
+    // "jsdoc",
+    "import"
+  ],
+  "ignorePatterns": ["**/lib-esm/**/*.js", "**/*.d.ts"],
+  "rules": {
+    "no-duplicate-imports": "error",
+    "no-tabs": "error",
+    "import/no-extraneous-dependencies": "error",
+    "@typescript-eslint/no-explicit-any": "off",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_"
+      }
+    ]
+  }
+}

.github/actions/node-and-build/action.yml

@@ -7,10 +7,10 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Setup Node.js 16
+    - name: Setup Node.js 18
       uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 https://github.com/actions/setup-node/commit/64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
       with:
-        node-version: 16
+        node-version: 18
       env:
         SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

.github/workflows/callable-unit-tests.yml

@@ -4,7 +4,7 @@ on: workflow_call
 
 jobs:
   unit_test:
-    name: Unit Tests
+    name: Lint & Unit Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -15,4 +15,4 @@ jobs:
         uses: ./amplify-api-next/.github/actions/node-and-build
       - name: Run tests
         working-directory: ./amplify-api-next
-        run: npm run test
+        run: npm run lint && npm run test

.prettierignore

@@ -5,5 +5,4 @@ bin
 lib
 docs
 tsconfig.tsbuildinfo
-**/*.js
-**/*.json
+**/*.js

packages/amplify-api-next-types/package.json

@@ -12,12 +12,12 @@
     }
   },
   "scripts": {
-    "lint": "eslint \"**/*.ts*\"",
     "build": "npm run build:esm",
     "build:esm": "npm run clean && tsc -p ./tsconfig.json",
     "build:esm:watch": "npm run build:esm --watch",
+    "clean": "rimraf lib-esm tsconfig.tsbuildinfo",
     "test": "echo \"No tests\"",
-    "clean": "rimraf lib-esm tsconfig.tsbuildinfo"
+    "lint": "eslint ."
   },
   "devDependencies": {
     "typescript": "^5.1.6"

packages/amplify-api-next-types/src/client/index.ts

@@ -6,7 +6,7 @@ export declare const __modelMeta__: unique symbol;
 export type ExtractModelMeta<T extends Record<any, any>> =
   T[typeof __modelMeta__];
 
-type Prettify<T> = T extends () => {}
+type Prettify<T> = T extends () => any
   ? () => ReturnType<T>
   : T extends object
   ? { [P in keyof T]: Prettify<T[P]> }
@@ -50,7 +50,7 @@ type MutationInput<
   ModelMeta extends Record<any, any>,
   Relationships = ModelMeta['relationships'],
 > = {
-  [Prop in keyof Fields as Fields[Prop] extends () => {}
+  [Prop in keyof Fields as Fields[Prop] extends () => any
     ? never
     : Prop]: Fields[Prop];
 } & {
@@ -60,7 +60,7 @@ type MutationInput<
 type ArrElementOrElement<ArrType> =
   ArrType extends readonly (infer ElementType)[] ? ElementType : ArrType;
 
-type FlatSchema<T, FlattenArray = true> = T extends () => {}
+type FlatSchema<T, FlattenArray = true> = T extends () => any
   ? FlattenArray extends true
     ? ArrElementOrElement<Awaited<ReturnType<T>>>
     : Awaited<ReturnType<T>>
@@ -69,7 +69,7 @@ type FlatSchema<T, FlattenArray = true> = T extends () => {}
   : T;
 
 type FlattenKeys<
-  T extends Record<string, unknown> = {},
+  T extends Record<string, unknown> = Record<string, unknown>,
   Key = keyof T,
 > = Key extends string
   ? T[Key] extends Record<string, unknown>
@@ -101,7 +101,7 @@ export type ModelTypes<
           ): Promise<T[K]>;
           list<SS extends FlattenKeys<Flat[K]>[] = never[]>(options?: {
             // TODO: strongly type filter
-            filter?: {};
+            filter?: object;
             selectionSet?: SS;
           }): Promise<Array<Joined<T[K], SS>>>;
 

packages/amplify-api-next-types/src/client/index.v3.ts

@@ -7,6 +7,6 @@ export type ExtractModelMeta<T extends Record<any, any>> =
   T[typeof __modelMeta__];
 
 export type ModelTypes<
-  T extends Record<any, any> = never,
-  ModelMeta extends Record<any, any> = any,
+  _T extends Record<any, any> = never,
+  _ModelMeta extends Record<any, any> = any,
 > = any;

packages/amplify-api-next/__tests__/.eslintrc.json

@@ -0,0 +1,8 @@
+{
+  "rules": {
+    // needed for testing
+    "@typescript-eslint/no-unused-vars": "off",
+    // needed for @ts-expect-error
+    "@typescript-eslint/ban-ts-comment": "off"
+  }
+}

packages/amplify-api-next/package.json

@@ -12,7 +12,7 @@
     "build": "npm run clean && tsc -p ./tsconfig.json",
     "clean": "rimraf lib-esm tsconfig.tsbuildinfo",
     "test": "jest __tests__",
-    "lint": "eslint \"**/*.ts*\""
+    "lint": "eslint ."
   },
   "dependencies": {
     "@aws-amplify/amplify-api-next-types-alpha": "*"

packages/amplify-api-next/src/Authorization.ts

@@ -73,13 +73,6 @@ export const Operations = [
 ] as const;
 export type Operation = (typeof Operations)[number];
 
-// type ImpliedFields<Fields extends string> = Record<
-//   Fields,
-//   any
-// >;
-
-type Shape = Record<string, any>;
-
 export type Authorization<
   AuthField extends string | undefined,
   AuthFieldPlurality extends boolean,
@@ -96,9 +89,9 @@ export type Authorization<
   };
 };
 
-export type OwnerField = {};
+export type OwnerField = object;
 
-type BuilderMethods<T extends {}> = {
+type BuilderMethods<T extends object> = {
   [K in keyof T as T[K] extends (...args: any) => any ? K : never]: T[K];
 };
 
@@ -109,7 +102,7 @@ type BuilderMethods<T extends {}> = {
  * @param without The field to prune.
  * @returns The pruned object.
  */
-function omit<T extends {}, O extends string>(
+function omit<T extends object, O extends string>(
   original: T,
   without: O,
 ): Omit<T, O> {
@@ -173,7 +166,7 @@ function validateProvider(
 function authData<
   Field extends string | undefined = 'owner',
   isMulti extends boolean = false,
-  Builders extends {} = {},
+  Builders extends object = object,
 >(
   defaults: Partial<Authorization<Field, isMulti>[typeof __data]>,
   builderMethods: Builders,
@@ -345,8 +338,8 @@ export type ImpliedAuthField<T extends Authorization<any, any>> =
       ? isMulti extends true
         ? { [K in Field]?: string[] }
         : { [K in Field]?: string }
-      : {}
-    : {};
+      : object
+    : object;
 
 /**
  * Turns the type from a list of `Authorization` rules like this:

packages/amplify-api-next/src/ClientSchema.ts

@@ -122,7 +122,7 @@ type ModelImpliedAuthFields<Schema extends ModelSchema<any>> = {
   >
     ? ImpliedAuthFields<Model['authorization'][number]> &
         ImpliedAuthFieldsFromFields<Model>
-    : {};
+    : object;
 };
 
 type ImpliedAuthFieldsFromFields<T> = UnionToIntersection<
@@ -132,9 +132,9 @@ type ImpliedAuthFieldsFromFields<T> = UnionToIntersection<
         | ModelRelationalField<any, any, any, infer Auth>
       ? Auth extends Authorization<any, any>
         ? ImpliedAuthFields<Auth>
-        : {}
-      : {}
-    : {}
+        : object
+      : object
+    : object
 >;
 
 /**

packages/amplify-api-next/src/ModelField.ts

@@ -1,4 +1,4 @@
-import { Authorization, __data } from './Authorization';
+import { Authorization } from './Authorization';
 
 /**
  * Used to "attach" auth types to ModelField without exposing them on the builder.

packages/amplify-api-next/src/ModelType.ts

@@ -1,9 +1,9 @@
-import { ModelField, InternalField, fields } from './ModelField';
+import { ModelField, InternalField } from './ModelField';
 import type {
   ModelRelationalField,
   InternalRelationalField,
 } from './ModelRelationalField';
-import { Authorization, ImpliedAuthFields } from './Authorization';
+import { Authorization } from './Authorization';
 import type { SetTypeSubArg } from './util';
 
 type ModelFields = Record<

packages/amplify-api-next/src/SchemaProcessor.ts

@@ -1,13 +1,7 @@
-import type {
-  ModelSchema,
-  ModelSchemaType,
-  InternalSchema,
-  ModelSchemaParamShape,
-} from './ModelSchema';
-import type { ModelField, InternalField } from './ModelField';
+import type { InternalSchema } from './ModelSchema';
+import { type ModelField, type InternalField, fields } from './ModelField';
 import type { InternalRelationalField } from './ModelRelationalField';
 import type { ModelType, InternalModel } from './ModelType';
-import { fields } from './ModelField';
 import { Authorization, __data } from './Authorization';
 import { DerivedApiDefinition } from './types';
 
@@ -85,14 +79,7 @@ function scalarFieldToGql(fieldDef: ScalarFieldDef, identifier?: string[]) {
 }
 
 function modelFieldToGql(fieldDef: ModelFieldDef) {
-  const {
-    type,
-    relatedModel,
-    array,
-    valueOptional,
-    arrayOptional,
-    connectionName,
-  } = fieldDef;
+  const { type, relatedModel, array, connectionName } = fieldDef;
 
   let field = relatedModel;
 

packages/amplify-api-next/src/util.ts

@@ -13,7 +13,7 @@ export type SetTypeSubArg<T, SetKey extends keyof T, Val> = {
   [Property in keyof T]: SetKey extends Property ? Val : T[Property];
 };
 
-export type Prettify<T> = T extends () => {}
+export type Prettify<T> = T extends () => any
   ? () => ReturnType<T>
   : T extends object
   ? { [P in keyof T]: Prettify<T[P]> }
@@ -44,7 +44,11 @@ export type UnionToIntersection<U> = (
  * @example
  * ExcludeEmpty<{a: 1} | {} | {b: 2}> => {a: 1} | {b: 2}
  */
-export type ExcludeEmpty<U> = U extends U ? ({} extends U ? never : U) : never;
+export type ExcludeEmpty<U> = U extends U
+  ? object extends U
+    ? never
+    : U
+  : never;
 
 export type Expect<T extends true> = T;
 export type ExpectTrue<T extends true> = T;
@@ -63,6 +67,6 @@ export type NotAny<T> = true extends IsAny<T> ? false : true;
 
 export type Debug<T> = { [K in keyof T]: T[K] };
 
-export type ObjectIsNonEmpty<T extends {}> = keyof T extends never
+export type ObjectIsNonEmpty<T extends object> = keyof T extends never
   ? false
   : true;