@tricoteuses/senat 0.3.2 → 1.1.1

package/lib/validators/config.ts

@@ -0,0 +1,79 @@
+import {
+  validateChain,
+  validateInteger,
+  validateNonEmptyTrimmedString,
+  validateNumber,
+  validateOption,
+  validateString,
+  validateStringToNumber,
+  validateTest,
+} from "@biryani/core"
+
+function validateDb(data: any): [any, any] {
+  if (data === null || data === undefined) {
+    return [data, "Missing value"]
+  }
+  if (typeof data !== "object") {
+    return [data, `Expected an object got "${typeof data}"`]
+  }
+
+  data = { ...data }
+  const errors: { [key: string]: any } = {}
+  const remainingKeys = new Set(Object.keys(data))
+
+  for (const key of ["host", "password", "user"]) {
+    remainingKeys.delete(key)
+    const [value, error] = validateNonEmptyTrimmedString(data[key])
+    data[key] = value
+    if (error !== null) {
+      errors[key] = error
+    }
+  }
+
+  {
+    const key = "port"
+    remainingKeys.delete(key)
+    const [value, error] = validateChain(
+      validateOption([validateString, validateStringToNumber], validateNumber),
+      validateInteger,
+      validateTest(
+        (value: any) => 0 <= value && value <= 65535,
+        "Must be an integer between 0 and 65535",
+      ),
+    )(data[key])
+    data[key] = value
+    if (error !== null) {
+      errors[key] = error
+    }
+  }
+
+  for (const key of remainingKeys) {
+    errors[key] = "Unexpected item"
+  }
+  return [data, Object.keys(errors).length === 0 ? null : errors]
+}
+
+export function validateConfig(data: any): [any, any] {
+  if (data === null || data === undefined) {
+    return [data, "Missing value"]
+  }
+  if (typeof data !== "object") {
+    return [data, `Expected an object got "${typeof data}"`]
+  }
+
+  data = { ...data }
+  const errors: { [key: string]: any } = {}
+  const remainingKeys = new Set(Object.keys(data))
+
+  {
+    const key = "db"
+    remainingKeys.delete(key)
+    const [value, error] = validateDb(data[key])
+    data[key] = value
+    if (error !== null) {
+      errors[key] = error
+    }
+  }
+
+  return [data, Object.keys(errors).length === 0 ? null : errors]
+}

package/lib/validators/senat.js

@@ -0,0 +1,28 @@
+// import { validateNonEmptyTrimmedString } from "@biryani/core"
+
+// const acteurUidRegExp = /^PA\d+$/
+// const organeUidRegExp = /^PO\d+$/
+
+// export function validateSenateurUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!acteurUidRegExp.test(value)) {
+//     return [value, 'Invalid "acteur" unique ID']
+//   }
+//   return [value, null]
+// }
+
+// export function validateOrganeUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!organeUidRegExp.test(value)) {
+//     return [value, 'Invalid "organe" unique ID']
+//   }
+//   return [value, null]
+// }
+"use strict";
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZhbGlkYXRvcnMvc2VuYXQudHMiXSwic291cmNlc0NvbnRlbnQiOlsiLy8gaW1wb3J0IHsgdmFsaWRhdGVOb25FbXB0eVRyaW1tZWRTdHJpbmcgfSBmcm9tIFwiQGJpcnlhbmkvY29yZVwiXG5cbi8vIGNvbnN0IGFjdGV1clVpZFJlZ0V4cCA9IC9eUEFcXGQrJC9cbi8vIGNvbnN0IG9yZ2FuZVVpZFJlZ0V4cCA9IC9eUE9cXGQrJC9cblxuLy8gZXhwb3J0IGZ1bmN0aW9uIHZhbGlkYXRlU2VuYXRldXJVaWQoaW5wdXQ6IGFueSk6IFthbnksIGFueV0ge1xuLy8gICBjb25zdCBbdmFsdWUsIGVycm9yXSA9IHZhbGlkYXRlTm9uRW1wdHlUcmltbWVkU3RyaW5nKGlucHV0KVxuLy8gICBpZiAoZXJyb3IgIT09IG51bGwpIHtcbi8vICAgICByZXR1cm4gW3ZhbHVlLCBlcnJvcl1cbi8vICAgfVxuLy8gICBpZiAoIWFjdGV1clVpZFJlZ0V4cC50ZXN0KHZhbHVlKSkge1xuLy8gICAgIHJldHVybiBbdmFsdWUsICdJbnZhbGlkIFwiYWN0ZXVyXCIgdW5pcXVlIElEJ11cbi8vICAgfVxuLy8gICByZXR1cm4gW3ZhbHVlLCBudWxsXVxuLy8gfVxuXG4vLyBleHBvcnQgZnVuY3Rpb24gdmFsaWRhdGVPcmdhbmVVaWQoaW5wdXQ6IGFueSk6IFthbnksIGFueV0ge1xuLy8gICBjb25zdCBbdmFsdWUsIGVycm9yXSA9IHZhbGlkYXRlTm9uRW1wdHlUcmltbWVkU3RyaW5nKGlucHV0KVxuLy8gICBpZiAoZXJyb3IgIT09IG51bGwpIHtcbi8vICAgICByZXR1cm4gW3ZhbHVlLCBlcnJvcl1cbi8vICAgfVxuLy8gICBpZiAoIW9yZ2FuZVVpZFJlZ0V4cC50ZXN0KHZhbHVlKSkge1xuLy8gICAgIHJldHVybiBbdmFsdWUsICdJbnZhbGlkIFwib3JnYW5lXCIgdW5pcXVlIElEJ11cbi8vICAgfVxuLy8gICByZXR1cm4gW3ZhbHVlLCBudWxsXVxuLy8gfVxuIl0sIm1hcHBpbmdzIjoiQUFBQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQUEiLCJpZ25vcmVMaXN0IjpbXX0=

package/lib/validators/senat.mjs

@@ -0,0 +1,24 @@
+"use strict";
+// import { validateNonEmptyTrimmedString } from "@biryani/core"
+// const acteurUidRegExp = /^PA\d+$/
+// const organeUidRegExp = /^PO\d+$/
+// export function validateSenateurUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!acteurUidRegExp.test(value)) {
+//     return [value, 'Invalid "acteur" unique ID']
+//   }
+//   return [value, null]
+// }
+// export function validateOrganeUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!organeUidRegExp.test(value)) {
+//     return [value, 'Invalid "organe" unique ID']
+//   }
+//   return [value, null]
+// }

package/lib/validators/senat.ts

@@ -0,0 +1,26 @@
+// import { validateNonEmptyTrimmedString } from "@biryani/core"
+
+// const acteurUidRegExp = /^PA\d+$/
+// const organeUidRegExp = /^PO\d+$/
+
+// export function validateSenateurUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!acteurUidRegExp.test(value)) {
+//     return [value, 'Invalid "acteur" unique ID']
+//   }
+//   return [value, null]
+// }
+
+// export function validateOrganeUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!organeUidRegExp.test(value)) {
+//     return [value, 'Invalid "organe" unique ID']
+//   }
+//   return [value, null]
+// }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "0.3.2",
+  "version": "1.1.1",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",
@@ -26,23 +26,44 @@
   "exports": {
     ".": {
       "import": "./lib/index.mjs",
-      "require": "./lib/index.js"
+      "require": "./lib/index.js",
+      "types": "./lib/index.d.ts"
     },
     "./package.json": "./package.json"
   },
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./lib/index.d.ts"
+      ]
+    }
+  },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "npm run build:types && npm run build:mjs && npm run build:cjs",
+    "build": "npm run build:types && npm run build:js && npm run build:mjs && npm run build:cjs && npm run build:static",
+    "build:js": "npx babel src --out-dir lib --extensions \".ts\" --source-maps inline",
     "build:cjs": "babel src --out-dir lib --extensions \".ts\" --source-maps inline",
     "build:mjs": "tsc && for file in lib/*.js lib/**/*.js; do new_file=`echo $file | sed 's/.js/.mjs/'`; mv $file $new_file; done",
     "build:types": "tsc --emitDeclarationOnly",
+    "build:static": "npx babel src --out-dir lib --copy-files",
     "prepublishOnly": "npm run build",
     "prettier": "prettier --write 'src/**/*.ts' 'tests/**/*.test.ts'",
     "type-check": "tsc --noEmit",
     "type-check:watch": "npm run type-check -- --watch"
   },
+  "dependencies": {
+    "@biryani/core": "^0.2.1",
+    "command-line-args": "^5.1.1",
+    "cross-fetch": "^3.0.4",
+    "dotenv": "^8.2.0",
+    "fs-extra": "^9.1.0",
+    "node-stream-zip": "^1.8.2",
+    "pg-promise": "^10.9.2",
+    "slug": "^4.0.2",
+    "windows-1252": "^1.0.0"
+  },
   "devDependencies": {
     "@babel/cli": "^7.11.6",
     "@babel/core": "^7.11.6",
@@ -51,10 +72,20 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-typescript": "^7.10.4",
+    "@typed-code/schemats": "^5.0.1",
+    "@types/command-line-args": "^5.0.0",
+    "@types/fs-extra": "^9.0.7",
+    "@types/node": "^14.14.28",
+    "@types/slug": "^0.9.1",
+    "babel-eslint": "^10.1.0",
+    "core-js": "^3.3.2",
     "eslint": "^8.22.0",
+    "prettier": "^2.2.1",
+    "regenerator-runtime": "^0.13.3",
+    "tslib": "^2.1.0",
     "typescript": "^4.1.5"
   },
   "engines": {
-    "node": ">=8"
+    "node": ">=16"
   }
 }