code review

azimuttapp · Oct 30, 2024 · 8b0bd91 · 8b0bd91
1 parent 53b06c9
commit 8b0bd91
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 49 deletions.
diff --git a/libs/aml/src/amlParser.ts b/libs/aml/src/amlParser.ts
@@ -667,7 +667,7 @@ function tokenPosition(token: IToken): TokenPosition {
 }
 
 function pos(value: number | undefined): number {
-    return value !== undefined && !isNaN(value) ? value : defaultPos
+    return value !== undefined && !Number.isNaN(value) ? value : defaultPos
 }
 
 // utils functions

diff --git a/libs/models/src/parserResult.ts b/libs/models/src/parserResult.ts
@@ -84,11 +84,11 @@ export const positionEndAdd = <T extends TokenPosition>(pos: T, value: number):
 })
 
 const posStart = (values: number[]): number => {
-    const valid = values.filter(n => n >= 0 && !isNaN(n) && isFinite(n))
+    const valid = values.filter(n => n >= 0 && !Number.isNaN(n) && isFinite(n))
     return valid.length > 0 ? Math.min(...valid) : 0
 }
 
 const posEnd = (values: number[]): number => {
-    const valid = values.filter(n => n >= 0 && !isNaN(n) && isFinite(n))
+    const valid = values.filter(n => n >= 0 && !Number.isNaN(n) && isFinite(n))
     return valid.length > 0 ? Math.max(...valid) : 0
 }
diff --git a/libs/parser-sql/src/postgresAst.ts b/libs/parser-sql/src/postgresAst.ts
@@ -94,7 +94,7 @@ export type TableCheckAst = { kind: 'Check', predicate: ExpressionAst } & Constr
 export type TableFkAst = { kind: 'ForeignKey', columns: IdentifierAst[], ref: { token: TokenInfo, schema?: IdentifierAst, table: IdentifierAst, columns?: IdentifierAst[] }, onUpdate?: ForeignKeyActionAst & {token: TokenInfo}, onDelete?: ForeignKeyActionAst & {token: TokenInfo} } & ConstraintCommonAst
 export type ConstraintCommonAst = { token: TokenInfo, constraint?: ConstraintNameAst }
 export type ConstraintNameAst = { token: TokenInfo, name: IdentifierAst }
-export type ColumnTypeAst = { token: TokenInfo, schema?: IdentifierAst, name: { token: TokenInfo, value: string }, args?: IntegerAst[], array?: TokenInfo }
+export type ColumnTypeAst = { token: TokenInfo, schema?: IdentifierAst, name: IdentifierAst, args?: IntegerAst[], array?: TokenInfo }
 export type ForeignKeyActionAst = { action: { kind: ForeignKeyAction, token: TokenInfo }, columns?: IdentifierAst[] }
 export type SetValueAst = IdentifierAst | LiteralAst | (IdentifierAst | LiteralAst)[] | { kind: 'Default', token: TokenInfo }
 export type OnConflictClauseAst = { token: TokenInfo, target?: OnConflictColumnsAst | OnConflictConstraintAst, action: OnConflictNothingAst | OnConflictUpdateAst }

diff --git a/libs/parser-sql/src/postgresBuilder.ts b/libs/parser-sql/src/postgresBuilder.ts
@@ -180,7 +180,7 @@ function buildTableAttr(index: number, c: TableColumnAst, notNull?: boolean): At
     return removeUndefined({
         name: c.name.value,
         type: c.type.name.value,
-        null: c.constraints?.find(c => c.kind === 'Nullable' ? !c.value : false) || notNull ? undefined : true,
+        null: (c.constraints?.find(c => c.kind === 'Nullable' ? !c.value : false) || notNull) ? undefined : true,
         // gen: z.boolean().optional(), // not handled for now
         default: (c.constraints || []).flatMap(c => c.kind === 'Default' ? [expressionToValue(c.expression)] : [])[0],
         // attrs: z.lazy(() => Attribute.array().optional()), // no nested attrs from SQL

diff --git a/libs/parser-sql/src/postgresParser.test.ts b/libs/parser-sql/src/postgresParser.test.ts
diff --git a/libs/parser-sql/src/postgresParser.ts b/libs/parser-sql/src/postgresParser.ts
@@ -110,7 +110,7 @@ import {
 } from "./postgresAst";
 
 const LineComment = createToken({name: 'LineComment', pattern: /--.*/, group: 'comments'})
-const BlockComment = createToken({name: 'BlockComment', pattern: /\/\*[^]*?\*\//, line_breaks: true, group: 'comments'})
+const BlockComment = createToken({name: 'BlockComment', pattern: /\/\*[\s\S]*?\*\//, line_breaks: true, group: 'comments'})
 const WhiteSpace = createToken({name: 'WhiteSpace', pattern: /\s+/, group: Lexer.SKIPPED})
 
 const Identifier = createToken({name: 'Identifier', pattern: /\b[a-zA-Z_]\w*\b|"([^\\"]|\\\\|\\")+"/})
@@ -1614,6 +1614,7 @@ class PostgresParser extends EmbeddedActionsParser {
             ]))})
             const array = $.OPTION3(() => tokenInfo2($.CONSUME(BracketLeft), $.CONSUME(BracketRight)))
             const name = {
+                kind: 'Identifier' as const,
                 token: mergePositions(parts.flatMap(p => [p.name?.token, p.last]).concat([array])),
                 value: parts.filter(isNotUndefined).map(p => p.name?.value + (p.args ? `(${p.args.map(v => v.value).join(', ')})` : '')).join(' ') + (array ? '[]' : '')
             }
@@ -1793,5 +1794,5 @@ function tokenPosition(token: IToken): TokenPosition {
 }
 
 function pos(value: number | undefined): number {
-    return value !== undefined && !isNaN(value) ? value : defaultPos
+    return value !== undefined && !Number.isNaN(value) ? value : defaultPos
 }
diff --git a/libs/utils/src/array.ts b/libs/utils/src/array.ts
@@ -15,10 +15,22 @@ export const collectOne = <T, U>(arr: T[], f: (t: T) => U | undefined): U | unde
     return undefined
 }
 
-export const distinct = <T>(arr: T[]): T[] => arr.filter((t, i) => arr.indexOf(t) === i)
+export const distinct = <T>(arr: T[]): T[] => {
+    const seen = new Set<T>()
+    return arr.filter(t => {
+        if (seen.has(t)) return false
+        seen.add(t)
+        return true
+    })
+}
 export const distinctBy = <T>(arr: T[], by: (t: T) => string | number): T[] => {
-    const arrStr = arr.map(t => by(t))
-    return arr.filter((t, i) => arrStr.indexOf(by(t)) === i)
+    const seen = new Set<string | number>()
+    return arr.filter(t => {
+        const key = by(t)
+        if (seen.has(key)) return false
+        seen.add(key)
+        return true
+    })
 }
 
 export type Diff<T> = {left: T[], right: T[], both: {left: T, right: T}[]}