npm - @furo/open-models - Versions diffs - 1.11.1 → 1.12.0 - Mend

@furo/open-models 1.11.1 → 1.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/Fetcher.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { deepJsonNameToProtoName, deepProtoNameToJsonName, protoNameToJsonName, } from './Mapper.js';
+import { deepJsonNameToProtoName, deepProtoNameToJsonName, jsonNameToProtoName, protoNameToJsonName } from './Mapper.js';
 export class Fetcher {
     /**
      *
@@ -374,7 +374,6 @@ export class Fetcher {
         // replace url templates with values
         // /v1/cube/{id} => /v1/cube/12
         fields.forEach(field => {
-            // TODO: check if qp is always set as proto name
             const rqoKey = protoNameToJsonName(field[1]);
             const rqoValue = rqo[rqoKey];
             evaluatedPath = evaluatedPath.replace(field[0], `${rqoValue}`);
@@ -397,11 +396,11 @@ export class Fetcher {
             keysForBodyOrQueryParams.forEach(key => {
                 if (Array.isArray(rqo[key])) {
                     rqo[key].forEach(e => {
-                        params.push(`${key}=${e}`);
+                        params.push(`${this.API_OPTIONS.PreserveProtoNames ? jsonNameToProtoName(key) : key}=${e}`);
                     });
                 }
                 else {
-                    params.push(`${key}=${rqo[key]}`);
+                    params.push(`${this.API_OPTIONS.PreserveProtoNames ? jsonNameToProtoName(key) : key}=${rqo[key]}`);
                 }
             });
             if (params.length) {

package/dist/Fetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../src/Fetcher.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n deepJsonNameToProtoName,\n deepProtoNameToJsonName,\n protoNameToJsonName,\n} from './Mapper';\n\nexport interface IApiOptions {\n // leave empty to connect to the same host which delivers your files, otherwise set something like http://localhost:3000\n serverAddr: string;\n ApiBaseURL: string;\n headers?: Headers;\n timeout?: number;\n PreserveProtoNames: boolean;\n}\n\ninterface Handlers<REQ, RES> {\n /*\n The `onResponse` handler is triggered, when we have a successful response.\n * @param response\n * @param serverResponse\n /\n onResponse?: (response: RES, serverResponse: Response) => void;\n\n /\n The `onResponseError` handler is triggered on any received status >=400.\n * @param parsedResponse - The parsed response body from the server.\n * @param serverResponse\n /\n onResponseError?: (parsedResponse: unknown, serverResponse: Response) => void;\n\n /\n The `onRequestStarted` handler is triggered, whenever a request is started.\n * @param req - The request object\n /\n onRequestStarted?: (req: REQ) => void;\n\n /\n The `onRequestFinished` handler is triggered, whenever a request is finished or aborted.\n * @param req - The request object\n /\n onRequestFinished?: (req: REQ) => void;\n\n /\n The `onRequestAborted` handler is triggered, whenever a request is aborted.\n * An abort can be triggered by\n * - calling `abortPendingRequest`.\n * - triggering the request again, while you have a pending request.\n * - by reaching the request timeout.\n \n The timeout can be set in the OPEN_MODELS_OPTIONS, the default is 600s aka 5min.\n \n @param req\n /\n onRequestAborted?: (req: REQ) => void;\n\n /\n The `onResponseRaw` handler is triggered, when we have a successful response.\n \n @param serverResponse\n /\n onResponseRaw?: (serverResponse: Response) => void;\n\n /\n The `onResponseErrorRaw` handler is triggered on any 400\n * @param serverResponse\n /\n onResponseErrorRaw?: (serverResponse: Response) => void;\n\n /\n The `onParseError` handler is triggered, when the content could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseParseError?: (error: unknown, serverResponse: Response) => void;\n /\n The `onParseError` handler is triggered, when the content of the error could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseErrorParseError?: (\n error: unknown,\n serverResponse: Response,\n ) => void;\n\n /\n The `onFatalError` handler is triggered when nothing could be caught with the cather.\n * This should not happen.\n * @param error\n /\n onFatalError?: (error: unknown) => void;\n}\n\nexport class Fetcher<REQ, RES> {\n public timeout: number;\n\n /\n Contains the response from the last request. Also on errors.\n /\n public lastResponse: Response \| undefined;\n\n /\n Indicator for a pending request. Maybe you are also interested on the `onRequestStarted` and `onRequestFinished` callback methods.\n /\n public isLoading: boolean = false;\n\n private path: string;\n\n private requestInit: RequestInit;\n\n private method: string;\n\n private responseHandler: Map<string, (r: Response) => void> = new Map<\n string,\n (r: Response) => void\n >();\n\n private abortController: AbortController;\n\n private timeoutId: ReturnType<typeof setTimeout> \| number \| undefined;\n\n private bodyField: keyof REQ \| '' \| undefined;\n\n private API_OPTIONS: IApiOptions;\n\n /*\n \n * @param options\n * @param method\n * @param path\n * @param bodyField\n /\n constructor(\n options: IApiOptions,\n // method\n method: string,\n // options path\n path: string,\n bodyField?: keyof REQ \| '',\n ) {\n this.API_OPTIONS = options;\n this.path = path;\n this.bodyField = bodyField;\n this.method = method;\n\n this.abortController = new AbortController();\n const { signal } = this.abortController;\n this.requestInit = {\n method: this.method,\n signal,\n headers: this.API_OPTIONS.headers,\n redirect: 'follow',\n };\n\n this.timeout = this.API_OPTIONS.timeout \|\| 300000; // chrome default timeout\n }\n\n public setRequestOptions(ri: RequestInit) {\n const { signal } = this.abortController;\n this.requestInit = {\n method: this.method,\n headers: this.API_OPTIONS.headers,\n signal,\n ...ri,\n };\n }\n\n /*\n setHandlers let you bind all handlers at once.\n * @param handlers\n /\n public setHandlers(handlers: Handlers<REQ, RES>) {\n this.onResponse = handlers.onResponse;\n this.onResponseError = handlers.onResponseError;\n this.onRequestStarted = handlers.onRequestStarted;\n this.onRequestFinished = handlers.onRequestFinished;\n this.onRequestAborted = handlers.onRequestAborted;\n this.onResponseRaw = handlers.onResponseRaw;\n this.onResponseErrorRaw = handlers.onResponseErrorRaw;\n this.onResponseParseError = handlers.onResponseParseError;\n this.onResponseErrorParseError = handlers.onResponseErrorParseError;\n this.onFatalError = handlers.onFatalError;\n }\n\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n public abortPendingRequest(reason: any): void {\n if (!this.isLoading) {\n return;\n }\n clearTimeout(this.timeoutId);\n this.isLoading = false;\n this.abortController.abort(reason);\n\n if (this.onRequestAborted) {\n this.onRequestAborted(reason);\n }\n }\n\n public invoke(rqo: REQ, options?: RequestInit): Promise<RES> {\n return new Promise((resolve, reject) => {\n // abort old request if it is still running\n if (this.isLoading) {\n this.abortPendingRequest('invoke triggered before response');\n }\n\n this.abortController = new AbortController();\n const { signal } = this.abortController;\n\n this.requestInit = {\n method: this.method,\n signal,\n headers: this.API_OPTIONS.headers,\n };\n\n if (options) {\n this.setRequestOptions(options);\n }\n\n this.isLoading = true;\n\n const { evaluatedPath, evaluatedBody } = this.buildPathAndBodyfield(\n this.path,\n this.bodyField,\n rqo,\n );\n if (evaluatedBody) {\n this.requestInit.body = evaluatedBody;\n }\n\n clearTimeout(this.timeoutId);\n const request = new Request(evaluatedPath, this.requestInit);\n this.timeoutId = setTimeout(() => {\n this.abortController.abort(`Timeout of ${this.timeout}ms reached`);\n if (this.onRequestAborted) {\n this.onRequestAborted(rqo);\n }\n // eslint-disable-next-line no-console\n console.error(\n `RequestService fetch aborted: Timeout of ${this.timeout}ms reached`,\n );\n reject(rqo);\n }, this.timeout);\n\n if (this.onRequestStarted) {\n this.onRequestStarted(rqo);\n }\n\n fetch(request)\n .then(response => {\n this._reworkRequest(response)\n .then(data => {\n resolve(data);\n })\n .catch(reject);\n if (this.onRequestFinished) {\n this.onRequestFinished(rqo);\n }\n })\n .catch(err => {\n this.isLoading = false;\n\n if (err.name === 'AbortError') {\n if (this.onRequestAborted) {\n this.onRequestAborted(rqo);\n }\n if (this.onRequestFinished) {\n this.onRequestFinished(rqo);\n }\n // eslint-disable-next-line no-console\n console.error('RequestService fetch aborted: ', err);\n } else {\n if (this.onRequestFinished) {\n this.onRequestFinished(rqo);\n }\n\n if (this.onFatalError) {\n this.onFatalError(err);\n }\n }\n reject(err);\n });\n });\n }\n\n /\n Succeeded is true if the request succeeded. The request succeeded if it\n * loaded without error, wasn't aborted, and the status code is ≥ 200, and\n * < 300, or if the status code is 0.\n /\n\n /\n Errorhandling according to Google rest-api-v3 Status Codes\n * (https://developers.google.com/maps-booking/reference/rest-api-v3/status_codes)\n \n Dispatches event `response-error` and a specific error event with status code\n * @private\n /\n _reworkRequest(response: Response): Promise<RES> {\n return new Promise((resolve, reject) => {\n /\n Status code 0 is accepted as a success because some schemes - e.g.,\n * file:// - don't provide status codes.\n /\n this.isLoading = false;\n clearTimeout(this.timeoutId);\n const status = response.status \|\| 0;\n\n if (status === 0 \|\| (status >= 200 && status < 300)) {\n /\n Loaded without error, fires event `response` with full response object\n /\n this.lastResponse = response;\n\n if (this.onResponseRaw) {\n this.onResponseRaw(response);\n }\n\n /\n parses response object according to response heaader informationen `content-type`\n * you will find the supported content-types in the declaration area\n /\n\n this._parseResponse(response)\n .then(r => {\n resolve(r as RES);\n if (this.onResponse) {\n this.onResponse(r as RES, response);\n }\n })\n .catch(error => {\n reject(error);\n if (this.onResponseParseError) {\n this.onResponseParseError(error, response);\n }\n });\n } else {\n /\n Error detected\n /\n this.lastResponse = response;\n if (this.onResponseErrorRaw) {\n this.onResponseErrorRaw(response);\n }\n\n /\n parses response object according to response heaader `content-type`\n /\n this._parseResponse(response)\n .then(r => {\n reject(r);\n if (this.onResponseError) {\n this.onResponseError(r, response);\n }\n })\n /\n error parsing is not possible, empty response\n * the dispatched event will have the raw error object in the event detail\n /\n .catch(error => {\n reject(error);\n if (this.onResponseErrorParseError) {\n this.onResponseErrorParseError(error, response);\n }\n });\n }\n });\n }\n\n /\n parses response object according to lastRequest header informationen `content-type`\n * you will find the supported content-types in the declaration area\n * response Fetch API response object [https://developer.mozilla.org/en-US/docs/Web/API/Response]\n * Default response handler is json!\n * @param response\n * @private\n /\n // eslint-disable-next-line class-methods-use-this\n _parseResponse(response: Response) {\n return new Promise((resolve, reject) => {\n if (response) {\n this.responseHandler.set('text/plain', r => {\n r.text()\n .then(text => {\n resolve(text);\n })\n .catch(err => {\n reject(err);\n });\n });\n\n this.responseHandler.set('text/html', r => {\n r.text()\n .then(text => {\n resolve(text);\n })\n .catch(err => {\n reject(err);\n });\n });\n this.responseHandler.set('application/json', r => {\n r.json()\n .then(json => {\n // convert to literal type when needed\n resolve(\n this.API_OPTIONS.PreserveProtoNames\n ? deepProtoNameToJsonName(json)\n : json,\n );\n })\n .catch(err => {\n reject(err);\n });\n });\n\n this.responseHandler.set('application/x-ndjson', r => {\n const preserveProtoNames = this.API_OPTIONS.PreserveProtoNames;\n\n const reader = r.body?.getReader();\n if (!reader) {\n throw new Error('NDJSON response has no readable body');\n }\n\n const decoder = new TextDecoder();\n let buffer = '';\n\n // Async generator that yields parsed NDJSON objects.\n const iterator = {\n async [Symbol.asyncIterator](): AsyncGenerator<RES> {\n while (true) {\n // eslint-disable-next-line no-await-in-loop\n const { done, value } = await reader.read();\n if (done) break;\n\n buffer += decoder.decode(value, { stream: true });\n\n // Split the buffer into lines. The last line may be incomplete.\n const lines = buffer.split('\\n');\n buffer = lines.pop() ?? '';\n\n for (const line of lines) {\n const trimmed = line.trim();\n if (trimmed === '') {\n // eslint-disable-next-line no-continue\n continue; // skip empty lines\n }\n\n // Parse the JSON line and yield the result.\n let parsed: RES;\n try {\n parsed = JSON.parse(trimmed) as RES;\n } catch (e) {\n // If parsing fails, we can choose to throw, skip, or yield an error object.\n // Here we simply rethrow to fail fast.\n throw new Error(`Failed to parse NDJSON line: ${trimmed}`);\n }\n\n yield preserveProtoNames\n ? (deepProtoNameToJsonName(parsed) as RES)\n : parsed;\n }\n }\n\n // Emit any remaining data after the last chunk.\n if (buffer.trim() !== '') {\n try {\n yield JSON.parse(buffer.trim()) as RES;\n } catch (e) {\n throw new Error(\n `Failed to parse final NDJSON line: ${buffer.trim()}`,\n );\n }\n }\n },\n };\n\n // Return the async iterator that satisfies the Symbol.asyncIterator contract.\n // as unknown as AsyncIterable<RES>\n resolve(iterator);\n });\n\n this.responseHandler.set('application/octet-stream', r => {\n r.arrayBuffer()\n .then(buffer => {\n resolve(buffer);\n })\n .catch(err => {\n reject(err);\n });\n });\n this.responseHandler.set('application/pdf', r => {\n r.blob()\n .then(blob => {\n resolve(blob);\n })\n .catch(err => {\n reject(err);\n });\n });\n this.responseHandler.set('image/jpeg', r => {\n r.blob()\n .then(blob => {\n resolve(blob);\n })\n .catch(err => {\n reject(err);\n });\n });\n\n const contentType = response.headers.get('content-type');\n let handler = contentType?.split(';')[0].trim();\n if (handler === undefined) {\n handler = 'application/json';\n }\n let typeHandler = this.responseHandler.get(handler);\n\n if (typeHandler === undefined) {\n // eslint-disable-next-line no-console\n console.error('No parser for', handler);\n typeHandler = this.responseHandler.get('application/json');\n }\n\n if (typeHandler) {\n typeHandler(response);\n }\n } else {\n reject(new Error('no response'));\n }\n });\n }\n\n private buildPathAndBodyfield(\n path: string,\n bodyField: keyof REQ \| '' \| undefined,\n rqo: REQ,\n ): {\n evaluatedPath: string;\n evaluatedBody: string \| undefined;\n } {\n // use the rules specified here https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/solo-kit/api/external/google/api/http.proto.sk/\n // find all fields in path\n let evaluatedPath = path;\n let evaluatedBody;\n\n const keysForBodyOrQueryParams: Map<string, keyof REQ> = new Map();\n Object.keys(rqo as object).forEach(key => {\n keysForBodyOrQueryParams.set(key, key as keyof REQ);\n });\n\n const fields = [...path.matchAll(/\\{([^}]+)}/g)];\n // replace url templates with values\n // /v1/cube/{id} => /v1/cube/12\n fields.forEach(field => {\n // TODO: check if qp is always set as proto name\n const rqoKey = protoNameToJsonName(field[1]) as keyof REQ;\n const rqoValue = rqo[rqoKey];\n evaluatedPath = evaluatedPath.replace(field[0], `${rqoValue}`);\n keysForBodyOrQueryParams.delete(rqoKey as string);\n });\n\n if (bodyField === '') {\n // build body object\n const body: { [key: string]: unknown } = {};\n keysForBodyOrQueryParams.forEach(key => {\n body[key as string] = rqo[key];\n });\n evaluatedBody = JSON.stringify(body);\n } else {\n // build query params\n const params: string[] = [];\n if (bodyField !== undefined) {\n keysForBodyOrQueryParams.delete(bodyField as string);\n }\n keysForBodyOrQueryParams.forEach(key => {\n if (Array.isArray(rqo[key])) {\n (rqo[key] as unknown[]).forEach(e => {\n params.push(`${key as string}=${e}`);\n });\n } else {\n params.push(`${key as string}=${rqo[key]}`);\n }\n });\n if (params.length) {\n evaluatedPath = `${evaluatedPath}?${params.join('&')}`;\n }\n\n if (bodyField !== undefined) {\n evaluatedBody = JSON.stringify(\n this.API_OPTIONS.PreserveProtoNames\n ? deepJsonNameToProtoName(rqo[bodyField])\n : rqo[bodyField],\n );\n }\n }\n\n evaluatedPath = `${this.API_OPTIONS.serverAddr}${this.API_OPTIONS.ApiBaseURL}${evaluatedPath}`;\n\n return {\n evaluatedPath,\n evaluatedBody,\n };\n }\n\n /*\n The `onResponse` handler is triggered, when we have a successful response.\n * @param response\n * @param serverResponse\n /\n onResponse?: (response: RES, serverResponse: Response) => void;\n\n /\n The `onResponseError` handler is triggered on any received status >=400.\n * @param parsedResponse - The parsed response body from the server.\n * @param serverResponse\n /\n onResponseError?: (parsedResponse: unknown, serverResponse: Response) => void;\n\n /\n The `onRequestStarted` handler is triggered, whenever a request is started.\n * @param req - The request object\n /\n onRequestStarted?: (req: REQ) => void;\n\n /\n The `onRequestFinished` handler is triggered, whenever a request is finished or aborted.\n * @param req - The request object\n /\n onRequestFinished?: (req: REQ) => void;\n\n /\n The `onRequestAborted` handler is triggered, whenever a request is aborted.\n * An abort can be triggered by\n * - calling `abortPendingRequest`.\n * - triggering the request again, while you have a pending request.\n * - by reaching the request timeout.\n \n The timeout can be set in the OPEN_MODELS_OPTIONS, the default is 600s aka 5min.\n \n @param req\n /\n onRequestAborted?: (req: REQ) => void;\n\n /\n The `onResponseRaw` handler is triggered, when we have a successful response.\n \n @param serverResponse\n /\n onResponseRaw?: (serverResponse: Response) => void;\n\n /\n The `onResponseErrorRaw` handler is triggered on any 400\n * @param serverResponse\n /\n onResponseErrorRaw?: (serverResponse: Response) => void;\n\n /\n The `onParseError` handler is triggered, when the content could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseParseError?: (error: unknown, serverResponse: Response) => void;\n\n /\n The `onParseError` handler is triggered, when the content of the error could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseErrorParseError?: (\n error: unknown,\n serverResponse: Response,\n ) => void;\n\n /\n The `onFatalError` handler is triggered when nothing could be caught with the cather.\n * This should not happen.\n * @param error\n */\n onFatalError?: (error: unknown) => void;\n}\n"]}
1	+ {"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../src/Fetcher.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n deepJsonNameToProtoName,\n deepProtoNameToJsonName, jsonNameToProtoName,\n protoNameToJsonName\n} from './Mapper';\n\nexport interface IApiOptions {\n // leave empty to connect to the same host which delivers your files, otherwise set something like http://localhost:3000\n serverAddr: string;\n ApiBaseURL: string;\n headers?: Headers;\n timeout?: number;\n PreserveProtoNames: boolean;\n}\n\ninterface Handlers<REQ, RES> {\n /*\n The `onResponse` handler is triggered, when we have a successful response.\n * @param response\n * @param serverResponse\n /\n onResponse?: (response: RES, serverResponse: Response) => void;\n\n /\n The `onResponseError` handler is triggered on any received status >=400.\n * @param parsedResponse - The parsed response body from the server.\n * @param serverResponse\n /\n onResponseError?: (parsedResponse: unknown, serverResponse: Response) => void;\n\n /\n The `onRequestStarted` handler is triggered, whenever a request is started.\n * @param req - The request object\n /\n onRequestStarted?: (req: REQ) => void;\n\n /\n The `onRequestFinished` handler is triggered, whenever a request is finished or aborted.\n * @param req - The request object\n /\n onRequestFinished?: (req: REQ) => void;\n\n /\n The `onRequestAborted` handler is triggered, whenever a request is aborted.\n * An abort can be triggered by\n * - calling `abortPendingRequest`.\n * - triggering the request again, while you have a pending request.\n * - by reaching the request timeout.\n \n The timeout can be set in the OPEN_MODELS_OPTIONS, the default is 600s aka 5min.\n \n @param req\n /\n onRequestAborted?: (req: REQ) => void;\n\n /\n The `onResponseRaw` handler is triggered, when we have a successful response.\n \n @param serverResponse\n /\n onResponseRaw?: (serverResponse: Response) => void;\n\n /\n The `onResponseErrorRaw` handler is triggered on any 400\n * @param serverResponse\n /\n onResponseErrorRaw?: (serverResponse: Response) => void;\n\n /\n The `onParseError` handler is triggered, when the content could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseParseError?: (error: unknown, serverResponse: Response) => void;\n /\n The `onParseError` handler is triggered, when the content of the error could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseErrorParseError?: (\n error: unknown,\n serverResponse: Response,\n ) => void;\n\n /\n The `onFatalError` handler is triggered when nothing could be caught with the cather.\n * This should not happen.\n * @param error\n /\n onFatalError?: (error: unknown) => void;\n}\n\nexport class Fetcher<REQ, RES> {\n public timeout: number;\n\n /\n Contains the response from the last request. Also on errors.\n /\n public lastResponse: Response \| undefined;\n\n /\n Indicator for a pending request. Maybe you are also interested on the `onRequestStarted` and `onRequestFinished` callback methods.\n /\n public isLoading: boolean = false;\n\n private path: string;\n\n private requestInit: RequestInit;\n\n private method: string;\n\n private responseHandler: Map<string, (r: Response) => void> = new Map<\n string,\n (r: Response) => void\n >();\n\n private abortController: AbortController;\n\n private timeoutId: ReturnType<typeof setTimeout> \| number \| undefined;\n\n private bodyField: keyof REQ \| '' \| undefined;\n\n private API_OPTIONS: IApiOptions;\n\n /*\n \n * @param options\n * @param method\n * @param path\n * @param bodyField\n /\n constructor(\n options: IApiOptions,\n // method\n method: string,\n // options path\n path: string,\n bodyField?: keyof REQ \| '',\n ) {\n this.API_OPTIONS = options;\n this.path = path;\n this.bodyField = bodyField;\n this.method = method;\n\n this.abortController = new AbortController();\n const { signal } = this.abortController;\n this.requestInit = {\n method: this.method,\n signal,\n headers: this.API_OPTIONS.headers,\n redirect: 'follow',\n };\n\n this.timeout = this.API_OPTIONS.timeout \|\| 300000; // chrome default timeout\n }\n\n public setRequestOptions(ri: RequestInit) {\n const { signal } = this.abortController;\n this.requestInit = {\n method: this.method,\n headers: this.API_OPTIONS.headers,\n signal,\n ...ri,\n };\n }\n\n /*\n setHandlers let you bind all handlers at once.\n * @param handlers\n /\n public setHandlers(handlers: Handlers<REQ, RES>) {\n this.onResponse = handlers.onResponse;\n this.onResponseError = handlers.onResponseError;\n this.onRequestStarted = handlers.onRequestStarted;\n this.onRequestFinished = handlers.onRequestFinished;\n this.onRequestAborted = handlers.onRequestAborted;\n this.onResponseRaw = handlers.onResponseRaw;\n this.onResponseErrorRaw = handlers.onResponseErrorRaw;\n this.onResponseParseError = handlers.onResponseParseError;\n this.onResponseErrorParseError = handlers.onResponseErrorParseError;\n this.onFatalError = handlers.onFatalError;\n }\n\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n public abortPendingRequest(reason: any): void {\n if (!this.isLoading) {\n return;\n }\n clearTimeout(this.timeoutId);\n this.isLoading = false;\n this.abortController.abort(reason);\n\n if (this.onRequestAborted) {\n this.onRequestAborted(reason);\n }\n }\n\n public invoke(rqo: REQ, options?: RequestInit): Promise<RES> {\n return new Promise((resolve, reject) => {\n // abort old request if it is still running\n if (this.isLoading) {\n this.abortPendingRequest('invoke triggered before response');\n }\n\n this.abortController = new AbortController();\n const { signal } = this.abortController;\n\n this.requestInit = {\n method: this.method,\n signal,\n headers: this.API_OPTIONS.headers,\n };\n\n if (options) {\n this.setRequestOptions(options);\n }\n\n this.isLoading = true;\n\n const { evaluatedPath, evaluatedBody } = this.buildPathAndBodyfield(\n this.path,\n this.bodyField,\n rqo,\n );\n if (evaluatedBody) {\n this.requestInit.body = evaluatedBody;\n }\n\n clearTimeout(this.timeoutId);\n const request = new Request(evaluatedPath, this.requestInit);\n this.timeoutId = setTimeout(() => {\n this.abortController.abort(`Timeout of ${this.timeout}ms reached`);\n if (this.onRequestAborted) {\n this.onRequestAborted(rqo);\n }\n // eslint-disable-next-line no-console\n console.error(\n `RequestService fetch aborted: Timeout of ${this.timeout}ms reached`,\n );\n reject(rqo);\n }, this.timeout);\n\n if (this.onRequestStarted) {\n this.onRequestStarted(rqo);\n }\n\n fetch(request)\n .then(response => {\n this._reworkRequest(response)\n .then(data => {\n resolve(data);\n })\n .catch(reject);\n if (this.onRequestFinished) {\n this.onRequestFinished(rqo);\n }\n })\n .catch(err => {\n this.isLoading = false;\n\n if (err.name === 'AbortError') {\n if (this.onRequestAborted) {\n this.onRequestAborted(rqo);\n }\n if (this.onRequestFinished) {\n this.onRequestFinished(rqo);\n }\n // eslint-disable-next-line no-console\n console.error('RequestService fetch aborted: ', err);\n } else {\n if (this.onRequestFinished) {\n this.onRequestFinished(rqo);\n }\n\n if (this.onFatalError) {\n this.onFatalError(err);\n }\n }\n reject(err);\n });\n });\n }\n\n /\n Succeeded is true if the request succeeded. The request succeeded if it\n * loaded without error, wasn't aborted, and the status code is ≥ 200, and\n * < 300, or if the status code is 0.\n /\n\n /\n Errorhandling according to Google rest-api-v3 Status Codes\n * (https://developers.google.com/maps-booking/reference/rest-api-v3/status_codes)\n \n Dispatches event `response-error` and a specific error event with status code\n * @private\n /\n _reworkRequest(response: Response): Promise<RES> {\n return new Promise((resolve, reject) => {\n /\n Status code 0 is accepted as a success because some schemes - e.g.,\n * file:// - don't provide status codes.\n /\n this.isLoading = false;\n clearTimeout(this.timeoutId);\n const status = response.status \|\| 0;\n\n if (status === 0 \|\| (status >= 200 && status < 300)) {\n /\n Loaded without error, fires event `response` with full response object\n /\n this.lastResponse = response;\n\n if (this.onResponseRaw) {\n this.onResponseRaw(response);\n }\n\n /\n parses response object according to response heaader informationen `content-type`\n * you will find the supported content-types in the declaration area\n /\n\n this._parseResponse(response)\n .then(r => {\n resolve(r as RES);\n if (this.onResponse) {\n this.onResponse(r as RES, response);\n }\n })\n .catch(error => {\n reject(error);\n if (this.onResponseParseError) {\n this.onResponseParseError(error, response);\n }\n });\n } else {\n /\n Error detected\n /\n this.lastResponse = response;\n if (this.onResponseErrorRaw) {\n this.onResponseErrorRaw(response);\n }\n\n /\n parses response object according to response heaader `content-type`\n /\n this._parseResponse(response)\n .then(r => {\n reject(r);\n if (this.onResponseError) {\n this.onResponseError(r, response);\n }\n })\n /\n error parsing is not possible, empty response\n * the dispatched event will have the raw error object in the event detail\n /\n .catch(error => {\n reject(error);\n if (this.onResponseErrorParseError) {\n this.onResponseErrorParseError(error, response);\n }\n });\n }\n });\n }\n\n /\n parses response object according to lastRequest header informationen `content-type`\n * you will find the supported content-types in the declaration area\n * response Fetch API response object [https://developer.mozilla.org/en-US/docs/Web/API/Response]\n * Default response handler is json!\n * @param response\n * @private\n /\n // eslint-disable-next-line class-methods-use-this\n _parseResponse(response: Response) {\n return new Promise((resolve, reject) => {\n if (response) {\n this.responseHandler.set('text/plain', r => {\n r.text()\n .then(text => {\n resolve(text);\n })\n .catch(err => {\n reject(err);\n });\n });\n\n this.responseHandler.set('text/html', r => {\n r.text()\n .then(text => {\n resolve(text);\n })\n .catch(err => {\n reject(err);\n });\n });\n this.responseHandler.set('application/json', r => {\n r.json()\n .then(json => {\n // convert to literal type when needed\n resolve(\n this.API_OPTIONS.PreserveProtoNames\n ? deepProtoNameToJsonName(json)\n : json,\n );\n })\n .catch(err => {\n reject(err);\n });\n });\n\n this.responseHandler.set('application/x-ndjson', r => {\n const preserveProtoNames = this.API_OPTIONS.PreserveProtoNames;\n\n const reader = r.body?.getReader();\n if (!reader) {\n throw new Error('NDJSON response has no readable body');\n }\n\n const decoder = new TextDecoder();\n let buffer = '';\n\n // Async generator that yields parsed NDJSON objects.\n const iterator = {\n async [Symbol.asyncIterator](): AsyncGenerator<RES> {\n while (true) {\n // eslint-disable-next-line no-await-in-loop\n const { done, value } = await reader.read();\n if (done) break;\n\n buffer += decoder.decode(value, { stream: true });\n\n // Split the buffer into lines. The last line may be incomplete.\n const lines = buffer.split('\\n');\n buffer = lines.pop() ?? '';\n\n for (const line of lines) {\n const trimmed = line.trim();\n if (trimmed === '') {\n // eslint-disable-next-line no-continue\n continue; // skip empty lines\n }\n\n // Parse the JSON line and yield the result.\n let parsed: RES;\n try {\n parsed = JSON.parse(trimmed) as RES;\n } catch (e) {\n // If parsing fails, we can choose to throw, skip, or yield an error object.\n // Here we simply rethrow to fail fast.\n throw new Error(`Failed to parse NDJSON line: ${trimmed}`);\n }\n\n yield preserveProtoNames\n ? (deepProtoNameToJsonName(parsed) as RES)\n : parsed;\n }\n }\n\n // Emit any remaining data after the last chunk.\n if (buffer.trim() !== '') {\n try {\n yield JSON.parse(buffer.trim()) as RES;\n } catch (e) {\n throw new Error(\n `Failed to parse final NDJSON line: ${buffer.trim()}`,\n );\n }\n }\n },\n };\n\n // Return the async iterator that satisfies the Symbol.asyncIterator contract.\n // as unknown as AsyncIterable<RES>\n resolve(iterator);\n });\n\n this.responseHandler.set('application/octet-stream', r => {\n r.arrayBuffer()\n .then(buffer => {\n resolve(buffer);\n })\n .catch(err => {\n reject(err);\n });\n });\n this.responseHandler.set('application/pdf', r => {\n r.blob()\n .then(blob => {\n resolve(blob);\n })\n .catch(err => {\n reject(err);\n });\n });\n this.responseHandler.set('image/jpeg', r => {\n r.blob()\n .then(blob => {\n resolve(blob);\n })\n .catch(err => {\n reject(err);\n });\n });\n\n const contentType = response.headers.get('content-type');\n let handler = contentType?.split(';')[0].trim();\n if (handler === undefined) {\n handler = 'application/json';\n }\n let typeHandler = this.responseHandler.get(handler);\n\n if (typeHandler === undefined) {\n // eslint-disable-next-line no-console\n console.error('No parser for', handler);\n typeHandler = this.responseHandler.get('application/json');\n }\n\n if (typeHandler) {\n typeHandler(response);\n }\n } else {\n reject(new Error('no response'));\n }\n });\n }\n\n private buildPathAndBodyfield(\n path: string,\n bodyField: keyof REQ \| '' \| undefined,\n rqo: REQ,\n ): {\n evaluatedPath: string;\n evaluatedBody: string \| undefined;\n } {\n // use the rules specified here https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/solo-kit/api/external/google/api/http.proto.sk/\n // find all fields in path\n let evaluatedPath = path;\n let evaluatedBody;\n\n const keysForBodyOrQueryParams: Map<string, keyof REQ> = new Map();\n Object.keys(rqo as object).forEach(key => {\n keysForBodyOrQueryParams.set(key, key as keyof REQ);\n });\n\n const fields = [...path.matchAll(/\\{([^}]+)}/g)];\n // replace url templates with values\n // /v1/cube/{id} => /v1/cube/12\n fields.forEach(field => {\n const rqoKey = protoNameToJsonName(field[1]) as keyof REQ;\n const rqoValue = rqo[rqoKey];\n evaluatedPath = evaluatedPath.replace(field[0], `${rqoValue}`);\n keysForBodyOrQueryParams.delete(rqoKey as string);\n });\n\n if (bodyField === '') {\n // build body object\n const body: { [key: string]: unknown } = {};\n keysForBodyOrQueryParams.forEach(key => {\n body[key as string] = rqo[key];\n });\n evaluatedBody = JSON.stringify(body);\n } else {\n // build query params\n const params: string[] = [];\n if (bodyField !== undefined) {\n keysForBodyOrQueryParams.delete(bodyField as string);\n }\n keysForBodyOrQueryParams.forEach(key => {\n if (Array.isArray(rqo[key])) {\n (rqo[key] as unknown[]).forEach(e => {\n params.push(`${this.API_OPTIONS.PreserveProtoNames? jsonNameToProtoName(key as string):(key as string)}=${e}`);\n });\n } else {\n\n params.push(`${this.API_OPTIONS.PreserveProtoNames? jsonNameToProtoName(key as string):(key as string)}=${rqo[key]}`);\n }\n });\n if (params.length) {\n evaluatedPath = `${evaluatedPath}?${params.join('&')}`;\n }\n\n if (bodyField !== undefined) {\n evaluatedBody = JSON.stringify(\n this.API_OPTIONS.PreserveProtoNames\n ? deepJsonNameToProtoName(rqo[bodyField])\n : rqo[bodyField],\n );\n }\n }\n\n evaluatedPath = `${this.API_OPTIONS.serverAddr}${this.API_OPTIONS.ApiBaseURL}${evaluatedPath}`;\n\n return {\n evaluatedPath,\n evaluatedBody,\n };\n }\n\n /*\n The `onResponse` handler is triggered, when we have a successful response.\n * @param response\n * @param serverResponse\n /\n onResponse?: (response: RES, serverResponse: Response) => void;\n\n /\n The `onResponseError` handler is triggered on any received status >=400.\n * @param parsedResponse - The parsed response body from the server.\n * @param serverResponse\n /\n onResponseError?: (parsedResponse: unknown, serverResponse: Response) => void;\n\n /\n The `onRequestStarted` handler is triggered, whenever a request is started.\n * @param req - The request object\n /\n onRequestStarted?: (req: REQ) => void;\n\n /\n The `onRequestFinished` handler is triggered, whenever a request is finished or aborted.\n * @param req - The request object\n /\n onRequestFinished?: (req: REQ) => void;\n\n /\n The `onRequestAborted` handler is triggered, whenever a request is aborted.\n * An abort can be triggered by\n * - calling `abortPendingRequest`.\n * - triggering the request again, while you have a pending request.\n * - by reaching the request timeout.\n \n The timeout can be set in the OPEN_MODELS_OPTIONS, the default is 600s aka 5min.\n \n @param req\n /\n onRequestAborted?: (req: REQ) => void;\n\n /\n The `onResponseRaw` handler is triggered, when we have a successful response.\n \n @param serverResponse\n /\n onResponseRaw?: (serverResponse: Response) => void;\n\n /\n The `onResponseErrorRaw` handler is triggered on any 400\n * @param serverResponse\n /\n onResponseErrorRaw?: (serverResponse: Response) => void;\n\n /\n The `onParseError` handler is triggered, when the content could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseParseError?: (error: unknown, serverResponse: Response) => void;\n\n /\n The `onParseError` handler is triggered, when the content of the error could not be parsed, according to the `content-type` header of the response.\n \n @param error\n * @param serverResponse\n /\n onResponseErrorParseError?: (\n error: unknown,\n serverResponse: Response,\n ) => void;\n\n /\n The `onFatalError` handler is triggered when nothing could be caught with the cather.\n * This should not happen.\n * @param error\n */\n onFatalError?: (error: unknown) => void;\n}\n"]}

package/dist/FieldNode.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@
  */
 import { ValueState } from './ValueState.js';
 import { FieldConstraints } from './FieldConstraints.js';
-type EventType = 'field-value-changed' | 'this-field-value-changed' | 'field-value-updated' | 'this-state-changed' | 'state-changed' | 'validity-changed' | 'array-changed' | 'this-array-changed' | 'map-changed' | 'this-map-changed' | 'model-injected';
+type EventType = 'update' | 'field-value-changed' | 'this-field-value-changed' | 'field-value-updated' | 'this-state-changed' | 'state-changed' | 'validity-changed' | 'array-changed' | 'this-array-changed' | 'map-changed' | 'this-map-changed' | 'parent-readonly-set' | 'parent-readonly-unset' | 'model-injected';
 type Meta = {
     businessVaueState: ValueState;
     index?: number;
@@ -101,6 +101,17 @@ export declare abstract class FieldNode {
      * @param {string} deepPath - Path of the field.
      */
     __getFieldNodeByPath(deepPath?: string): FieldNode | undefined;
+    /**
+     * Check if the node is "readonly"
+     *
+     * When any this node or any parent is *ro*, this will return false.
+     *
+     */
+    __isLogicalReadonly(): boolean;
+    /**
+     * Set the readonly state
+     * @param v
+     */
     set __readonly(v: boolean);
     get __readonly(): boolean;
     /**

package/dist/FieldNode.js CHANGED Viewed

@@ -61,7 +61,7 @@ export class FieldNode {
             isArrayNode: false,
             isRecursionNode: false,
             isAnyNode: false,
-            eventListener: new Map(),
+            eventListener: new Map()
         };
         this.___readonlyState = new Map();
         this.__parentNode = parent;
@@ -104,22 +104,33 @@ export class FieldNode {
         }
         return undefined;
     }
+    /**
+     * Check if the node is "readonly"
+     *
+     * When any this node or any parent is *ro*, this will return false.
+     *
+     */
+    __isLogicalReadonly() {
+        if (this.__readonly) {
+            return true;
+        }
+        if (this.__parentNode) {
+            return this.__parentNode.__isLogicalReadonly();
+        }
+        return false;
+    }
+    /**
+     * Set the readonly state
+     * @param v
+     */
     set __readonly(v) {
+        // to save resources, we could check for __isReadonly and fire the event based on this
         this.__meta.readonly = v;
         // dispatch to children
-        this.__childNodes.forEach(child => {
-            if (child instanceof FieldNode) {
-                // store readonly state if
-                const cro = this.___readonlyState.get(child);
-                if (cro === undefined) {
-                    this.___readonlyState.set(child, child.__readonly);
-                }
-                if (!child.__readonly && v) {
-                    // eslint-disable-next-line no-param-reassign
-                    child.__readonly = v;
-                }
-            }
-        });
+        this.__broadcastEvent(new CustomEvent(v ? 'parent-readonly-set' : 'parent-readonly-unset', {
+            detail: this,
+            bubbles: false
+        }));
     }
     get __readonly() {
         return this.__meta.readonly;
@@ -135,7 +146,7 @@ export class FieldNode {
         this.__dispatchEvent(new CustomEvent('model-injected', {
             composed: true,
             bubbles: false,
-            detail: this,
+            detail: this
         }));
         this.__meta.isPristine = true;
         // this.__notifyFieldValueChange(true);
@@ -331,7 +342,7 @@ export class FieldNode {
             carrier.push({
                 field: this.__fieldPath,
                 state: this.__meta.valueState,
-                message: this.__meta.stateMessage,
+                message: this.__meta.stateMessage
             });
         }
         this.__childNodes.forEach(child => {
@@ -354,7 +365,7 @@ export class FieldNode {
         });
         this.__dispatchEvent(new CustomEvent('state-changed', {
             detail: this,
-            bubbles: false,
+            bubbles: false
         }));
     }
     /**
@@ -384,12 +395,12 @@ export class FieldNode {
                 if (fn.__meta.isValid !== validStateBefore) {
                     fn.__dispatchEvent(new CustomEvent('validity-changed', {
                         detail: fn,
-                        bubbles: true,
+                        bubbles: true
                     }));
                 }
                 fn.__dispatchEvent(new CustomEvent('state-changed', {
                     detail: fn,
-                    bubbles: false,
+                    bubbles: false
                 }));
             }
         });
@@ -513,7 +524,7 @@ export class FieldNode {
         if (this.__meta.isValid !== validStateBefore) {
             this.__dispatchEvent(new CustomEvent('validity-changed', {
                 detail: this,
-                bubbles: false,
+                bubbles: false
             }));
         }
     }
@@ -547,7 +558,7 @@ export class FieldNode {
         if (this.__meta.isValid !== validStateBefore) {
             this.__dispatchEvent(new CustomEvent('validity-changed', {
                 detail: this,
-                bubbles: false,
+                bubbles: false
             }));
         }
         if (this.__parentNode) {
@@ -618,15 +629,18 @@ export class FieldNode {
      * @param {string[]} messageAndParams - Description for the formatter.
      */
     __setValueState(state, messageAndParams) {
+        const shouldNotify = (this.__meta.valueState !== state);
         this.__meta.valueState = state;
         this.__meta.stateMessage = OPEN_MODELS_OPTIONS.valueStateMessageFormatter(messageAndParams[0], ...messageAndParams.slice(1));
         // set invalid on error state
         // the event is sent from ...
         this.__meta.isValid = state !== ValueState.Negative;
-        this.__dispatchEvent(new CustomEvent('state-changed', {
-            detail: this,
-            bubbles: false,
-        }));
+        if (shouldNotify) {
+            this.__dispatchEvent(new CustomEvent('state-changed', {
+                detail: this,
+                bubbles: false
+            }));
+        }
     }
     /**
      * Resets the node to the last inserted literal or to the initial state.
@@ -651,7 +665,7 @@ export class FieldNode {
         this.__isEmpty = true;
         // __clear every childNode too
         this.__meta.nodeFields.forEach(descriptor => {
-            this[`_${descriptor.fieldName}`].__clear();
+            this[`_${descriptor.fieldName}`].__clear(withoutNotification);
         });
         if (!withoutNotification) {
             this.__notifyFieldValueChange(false);
@@ -708,7 +722,7 @@ export class FieldNode {
     __notifyFieldValueChange(bubbles) {
         this.__dispatchEvent(new CustomEvent('this-field-value-changed', {
             detail: this,
-            bubbles: false,
+            bubbles: false
         }));
         if (bubbles) {
             this.__rootNode.__meta.isPristine = false;
@@ -717,6 +731,10 @@ export class FieldNode {
             this.__meta.isPristine = false;
             //    console.log('bubble', this.__meta.typeName)
             this.__dispatchEvent(new CustomEvent('field-value-changed', {
+                detail: this,
+                bubbles: true
+            }));
+            this.__dispatchEvent(new CustomEvent('update', {
                 detail: this,
                 bubbles: true,
             }));
@@ -727,6 +745,10 @@ export class FieldNode {
                 detail: this,
                 bubbles: false,
             }));
+            this.__dispatchEvent(new CustomEvent('update', {
+                detail: this,
+                bubbles: false,
+            }));
         }
     }
     /**